Skip to content

subtitle tracks with no srclang show up as " (label)" instead of just "label"#42852

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
dcrousso:eng/290226
Mar 24, 2025
Merged

subtitle tracks with no srclang show up as " (label)" instead of just "label"#42852
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
dcrousso:eng/290226

Conversation

@dcrousso
Copy link
Copy Markdown
Member

@dcrousso dcrousso commented Mar 22, 2025

83905fa

subtitle tracks with no `srclang` show up as " (label)" instead of just "label"
https://bugs.webkit.org/show_bug.cgi?id=290226

Reviewed by Eric Carlson.

* Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::trackDisplayName):
Only use the localized format string if both parts are valid.

* Source/WebCore/page/CaptionUserPreferences.cpp:
(WebCore::trackDisplayName):
Strip any leading/trailing whitespace from the `label` before deciding whether to use it.

* LayoutTests/media/modern-media-controls/tracks-support/sorted-by-user-preferred-languages.html:
* LayoutTests/media/modern-media-controls/tracks-support/sorted-by-user-preferred-languages-expected.txt:

Canonical link: https://commits.webkit.org/292577@main

e2f136d

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ❌ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ❌ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ❌ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🧪 vision-wk2 ❌ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@dcrousso dcrousso requested a review from cdumez as a code owner March 22, 2025 00:31
@dcrousso dcrousso self-assigned this Mar 22, 2025
@dcrousso dcrousso added the Media Bugs related to the HTML 5 Media elements. label Mar 22, 2025
@dcrousso dcrousso requested a review from eric-carlson March 22, 2025 00:32
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 22, 2025
@dcrousso dcrousso removed the merging-blocked Applied to prevent a change from being merged label Mar 22, 2025
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 23, 2025
@dcrousso dcrousso removed the merging-blocked Applied to prevent a change from being merged label Mar 23, 2025
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 23, 2025
@dcrousso dcrousso removed the merging-blocked Applied to prevent a change from being merged label Mar 23, 2025
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 23, 2025
@dcrousso dcrousso added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Mar 24, 2025
…st "label"

https://bugs.webkit.org/show_bug.cgi?id=290226

Reviewed by Eric Carlson.

* Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::trackDisplayName):
Only use the localized format string if both parts are valid.

* Source/WebCore/page/CaptionUserPreferences.cpp:
(WebCore::trackDisplayName):
Strip any leading/trailing whitespace from the `label` before deciding whether to use it.

* LayoutTests/media/modern-media-controls/tracks-support/sorted-by-user-preferred-languages.html:
* LayoutTests/media/modern-media-controls/tracks-support/sorted-by-user-preferred-languages-expected.txt:

Canonical link: https://commits.webkit.org/292577@main
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 292577@main (83905fa): https://commits.webkit.org/292577@main

Reviewed commits have been landed. Closing PR #42852 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 83905fa into WebKit:main Mar 24, 2025
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Mar 24, 2025
@dcrousso dcrousso deleted the eng/290226 branch March 24, 2025 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Media Bugs related to the HTML 5 Media elements.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants