Changeset 128582 in webkit

Timestamp:

Sep 14, 2012 3:59:57 AM (12 years ago)

Author:

keishi@webkit.org

Message:

LocaleMac should fallback to defaultLanguage for an invalid locale
​https://bugs.webkit.org/show_bug.cgi?id=96744

Reviewed by Kent Tamura.

Source/WebCore:

There is no way to tell if a locale identifier is valid or not in Cocoa
so we look if we have a matching language in the list of
ISOLanguageCodes given by NSLocale.

Covered in LocaleMacTest.invalidLocale.

• platform/text/mac/LocaleMac.mm:

(WebCore):
(WebCore::LocaleMac::LocaleMac):
(WebCore::LocaleMac::create):

Source/WebKit/chromium:

• tests/LocaleMacTest.cpp:

(TEST_F):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/text/mac/LocaleMac.mm (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/LocaleMacTest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-14  Keishi Hattori  <keishi@webkit.org>
+
+        LocaleMac should fallback to defaultLanguage for an invalid locale
+        https://bugs.webkit.org/show_bug.cgi?id=96744
+
+        Reviewed by Kent Tamura.
+
+        There is no way to tell if a locale identifier is valid or not in Cocoa
+        so we look if we have a matching language in the list of
+        ISOLanguageCodes given by NSLocale.
+
+        Covered in LocaleMacTest.invalidLocale.
+
+        * platform/text/mac/LocaleMac.mm:
+        (WebCore):
+        (WebCore::LocaleMac::LocaleMac):
+        (WebCore::LocaleMac::create):
+
 2012-09-14  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/platform/text/mac/LocaleMac.mm

@@ -72 +72 @@
     , m_didInitializeNumberData(false)
 {
+    NSArray* availableLanguages = [NSLocale ISOLanguageCodes];
+    // NSLocale returns a lower case NSLocaleLanguageCode so we don't have care about case.
+    NSString* language = [m_locale.get() objectForKey:NSLocaleLanguageCode];
+    if ([availableLanguages indexOfObject:language] == NSNotFound)
+        m_locale = [[NSLocale alloc] initWithLocaleIdentifier:defaultLanguage()];
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-14  Keishi Hattori  <keishi@webkit.org>
+
+        LocaleMac should fallback to defaultLanguage for an invalid locale
+        https://bugs.webkit.org/show_bug.cgi?id=96744
+
+        Reviewed by Kent Tamura.
+
+        * tests/LocaleMacTest.cpp:
+        (TEST_F):
+
 2012-09-13  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/tests/LocaleMacTest.cpp

@@ -222 +222 @@
 #endif
 
+TEST_F(LocaleMacTest, invalidLocale)
+{
+    EXPECT_STREQ(monthLabel("en_US", January).utf8().data(), monthLabel("foo", January).utf8().data());
+    EXPECT_STREQ(decimalSeparator("en_US").utf8().data(), decimalSeparator("foo").utf8().data());
+}
+
 static void testNumberIsReversible(const AtomicString& localeString, const char* original, const char* shouldHave = 0)
 {