Title: [121833] trunk
- Revision
- 121833
- Author
- [email protected]
- Date
- 2012-07-04 00:29:30 -0700 (Wed, 04 Jul 2012)
Log Message
[EFL] Change format of return value of navigator.language
https://bugs.webkit.org/show_bug.cgi?id=89639
Patch by Kihong Kwon <[email protected]> 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
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121832 => 121833)
--- trunk/LayoutTests/ChangeLog 2012-07-04 07:03:24 UTC (rev 121832)
+++ trunk/LayoutTests/ChangeLog 2012-07-04 07:29:30 UTC (rev 121833)
@@ -1,3 +1,12 @@
+2012-07-04 Kihong Kwon <[email protected]>
+
+ [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 <[email protected]>
[Chromium] Unreviewed gardening for Mac
Modified: trunk/LayoutTests/platform/efl/TestExpectations (121832 => 121833)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-07-04 07:03:24 UTC (rev 121832)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-07-04 07:29:30 UTC (rev 121833)
@@ -679,9 +679,6 @@
// EFL port does not support hyphenation
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
BUGWK86637 : editing/spelling/spellcheck-async-mutation.html = TEXT
Modified: trunk/Source/WebCore/ChangeLog (121832 => 121833)
--- trunk/Source/WebCore/ChangeLog 2012-07-04 07:03:24 UTC (rev 121832)
+++ trunk/Source/WebCore/ChangeLog 2012-07-04 07:29:30 UTC (rev 121833)
@@ -1,3 +1,18 @@
+2012-07-04 Kihong Kwon <[email protected]>
+
+ [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 <[email protected]>
[GTK] Don't show accel labels in context menu items
Modified: trunk/Source/WebCore/platform/efl/LanguageEfl.cpp (121832 => 121833)
--- trunk/Source/WebCore/platform/efl/LanguageEfl.cpp 2012-07-04 07:03:24 UTC (rev 121832)
+++ trunk/Source/WebCore/platform/efl/LanguageEfl.cpp 2012-07-04 07:29:30 UTC (rev 121833)
@@ -43,7 +43,13 @@
if (!localeDefault)
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;
}
Vector<String> platformUserPreferredLanguages()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
