Changeset 180984 in webkit

Timestamp:

Mar 3, 2015 7:33:42 PM (9 years ago)

Author:

ap@apple.com

Message:

[Mac] Track localized name follows locale instead of primary language
​https://bugs.webkit.org/show_bug.cgi?id=142242
rdar://problem/20000365

Reviewed by Eric Carlson.

Source/WebCore:

• page/CaptionUserPreferencesMediaAF.cpp: (WebCore::trackDisplayName): Use the

language for localization, as CFBundle does.

LayoutTests:

• platform/mac/media/video-controls-captions-trackmenu-sorted-expected.txt: This

test now successfully switches to Japanese, as originally intended.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/media/video-controls-captions-trackmenu-sorted-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-03  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Track localized name follows locale instead of primary language
+        https://bugs.webkit.org/show_bug.cgi?id=142242
+        rdar://problem/20000365
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac/media/video-controls-captions-trackmenu-sorted-expected.txt: This
+        test now successfully switches to Japanese, as originally intended.
+
 2015-03-03  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/platform/mac/media/video-controls-captions-trackmenu-sorted-expected.txt

@@ -26 +26 @@
 EXPECTED (trackMenuItems[0].textContent == 'Off') OK
 EXPECTED (trackMenuItems[1].textContent == 'Auto (Recommended)') OK
-EXPECTED (trackMenuItems[2].textContent == 'z (Japanese)') OK
-EXPECTED (trackMenuItems[3].textContent == 'v (English)') OK
-EXPECTED (trackMenuItems[4].textContent == 'x (English-Australia)') OK
+EXPECTED (trackMenuItems[2].textContent == 'z (Japanese)'), OBSERVED 'z (日本語)' FAIL
+EXPECTED (trackMenuItems[3].textContent == 'v (English)'), OBSERVED 'v (英語)' FAIL
+EXPECTED (trackMenuItems[4].textContent == 'x (English-Australia)'), OBSERVED 'x (英語-オーストラリア)' FAIL
 EXPECTED (video.textTracks.length == '6') OK
 EXPECTED (trackMenuItems.length == '5') OK

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-03  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Track localized name follows locale instead of primary language
+        https://bugs.webkit.org/show_bug.cgi?id=142242
+        rdar://problem/20000365
+
+        Reviewed by Eric Carlson.
+
+        * page/CaptionUserPreferencesMediaAF.cpp: (WebCore::trackDisplayName): Use the
+        language for localization, as CFBundle does.
+
 2015-03-03  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

@@ -593 +593 @@
     String trackLanguageIdentifier = track->language();
 
-    RetainPtr<CFLocaleRef> currentLocale = adoptCF(CFLocaleCopyCurrent());
+    RetainPtr<CFLocaleRef> currentLocale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, defaultLanguage().createCFString().get()));
     RetainPtr<CFStringRef> localeIdentifier = adoptCF(CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, trackLanguageIdentifier.createCFString().get()));
     RetainPtr<CFStringRef> languageCF = adoptCF(CFLocaleCopyDisplayNameForPropertyValue(currentLocale.get(), kCFLocaleLanguageCode, localeIdentifier.get()));