Changeset 121833 in webkit

Timestamp:

Jul 4, 2012 12:29:30 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Change format of return value of navigator.language
​https://bugs.webkit.org/show_bug.cgi?id=89639

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-07-04
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Remove encoding type from return value of navigator.language.
For example, from en-US.UTF-8 to en-US.

Use exist test case (fast/js/navigator-language.html).

• platform/efl/LanguageEfl.cpp:

(WebCore::platformLanguage):

LayoutTests:

• platform/efl/TestExpectations: Remove fast/js/navigator-language.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/efl/LanguageEfl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-04  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        [EFL] Change format of return value of navigator.language
+        https://bugs.webkit.org/show_bug.cgi?id=89639
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * platform/efl/TestExpectations: Remove fast/js/navigator-language.html
+
 2012-07-04  Yoshifumi Inoue  <yosin@chromium.org>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -680 +680 @@
 BUGWK89830 : fast/text/hyphen-min-preferred-width.html = IMAGE
 
-// EFL format for navigator.language should be adapted
-BUGWK89639 : fast/js/navigator-language.html = TEXT
-
 // EFL's LayoutTestController does not implement setAsynchronousSpellCheckingEnabled
 BUGWK86637 : editing/spelling/spellcheck-async.html = TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-04  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        [EFL] Change format of return value of navigator.language
+        https://bugs.webkit.org/show_bug.cgi?id=89639
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove encoding type from return value of navigator.language.
+        For example, from en-US.UTF-8 to en-US.
+
+        Use exist test case (fast/js/navigator-language.html).
+
+        * platform/efl/LanguageEfl.cpp:
+        (WebCore::platformLanguage):
+
 2012-07-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/efl/LanguageEfl.cpp

@@ -44 +44 @@
         return String("c");
 
-    return String(localeDefault).replace('_', '-');
+    String locale = String(localeDefault);
+    locale.replace('_', '-');
+    size_t position = locale.find('.');
+    if (position != notFound)
+        locale = locale.left(position);
+
+    return locale;
 }