Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/every-berries-doubt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@theoplayer/web-ui': patch
---

Improve labels for text tracks and audio tracks in the `<theoplayer-language-menu>`.
40 changes: 20 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"rollup-plugin-string": "^3.0.0",
"rollup-plugin-swc3": "^0.12.1",
"serve": "^14.2.4",
"theoplayer": "^10.6.1",
"theoplayer": "^10.13.0",
"tslib": "^2.8.1",
"typedoc": "^0.27.7",
"typedoc-plugin-mdn-links": "^4.0.12",
Expand Down
2 changes: 1 addition & 1 deletion react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"rollup": "^4.34.6",
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-swc3": "^0.12.1",
"theoplayer": "^10.6.1",
"theoplayer": "^10.13.0",
"tslib": "^2.8.1",
"typedoc": "^0.27.7",
"typedoc-plugin-external-resolver": "^1.0.3",
Expand Down
15 changes: 10 additions & 5 deletions src/components/MediaTrackRadioButton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,19 @@ export class MediaTrackRadioButton extends RadioButton {

function getTrackLabel(track: MediaTrack): string {
let label = track.label;
let languageCode = track.language;
if (label) {
return label;
if (label === languageCode) {
// Ignore default label with just the language code.
} else {
return label;
}
}
let languageCode = track.language;
if (!languageCode) {
return '';
let localizedLanguageName = languageCode && localizeLanguageName(languageCode);
if (localizedLanguageName) {
return localizedLanguageName;
}
return localizeLanguageName(languageCode) || languageCode || '';
return languageCode || label || '';
}

customElements.define('theoplayer-media-track-radio-button', MediaTrackRadioButton);
Expand Down
27 changes: 22 additions & 5 deletions src/components/TextTrackRadioButton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ import { localizeLanguageName, setTextContent } from '../util/CommonUtils';
import { Attribute } from '../util/Attribute';
import { createTemplate } from '../util/TemplateUtils';

declare module 'theoplayer/chromeless' {
interface TextTrack {
// TODO Remove after updating to THEOplayer 10.14.0.
captionChannel?: number;
}
}

const template = createTemplate('theoplayer-text-track-radio-button', buttonTemplate(`<slot></slot>`));

const TRACK_EVENTS = ['change', 'update'] as const;
Expand Down Expand Up @@ -70,14 +77,24 @@ export class TextTrackRadioButton extends RadioButton {

function getTrackLabel(track: TextTrack): string {
let label = track.label;
let languageCode = track.language;
if (label) {
return label;
if (label === languageCode) {
// Ignore default label with just the language code.
} else if (track.type === 'cea608' && /^CC\d+$/.test(track.label)) {
// Ignore default label with just the caption channel.
} else {
return label;
}
}
let languageCode = track.language;
if (!languageCode) {
return '';
let localizedLanguageName = languageCode && localizeLanguageName(languageCode);
if (localizedLanguageName) {
return localizedLanguageName;
}
if (track.type === 'cea608' && typeof track.captionChannel === 'number') {
return `CC${track.captionChannel}`;
}
return localizeLanguageName(languageCode) || languageCode || '';
return languageCode || label || '';
}

customElements.define('theoplayer-text-track-radio-button', TextTrackRadioButton);
Expand Down
Loading