Changeset 50244 in webkit

Timestamp:

Oct 28, 2009 3:42:42 PM (14 years ago)

Author:

kov@webkit.org

Message:

LayoutTests

Reviewed by Xan Lopez.

[GTK] Fails new test fast/js/navigator-language.html
​https://bugs.webkit.org/show_bug.cgi?id=30440

Unskip the test that now passes.

• platform/gtk/Skipped:

WebCore

Reviewed by Xan Lopez.

[GTK] Fails new test fast/js/navigator-language.html
​https://bugs.webkit.org/show_bug.cgi?id=30440

Reimplement WebCore::defaultLanguage to account for changes in
locale done by setLocale.

Already existing test: fast/js/navigator-language.html

• platform/gtk/Language.cpp: (WebCore::defaultLanguage):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/Language.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-28  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Fails new test fast/js/navigator-language.html
+        https://bugs.webkit.org/show_bug.cgi?id=30440
+
+        Unskip the test that now passes.
+
+        * platform/gtk/Skipped:
+
 2009-10-28  Jonathan Dixon  <joth@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -1460 +1460 @@
 fast/events/drag-and-drop.html
 fast/events/drag-parent-node.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=30440
-fast/js/navigator-language.html
 
 fast/xmlhttprequest/null-document-xmlhttprequest-open.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-28  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Fails new test fast/js/navigator-language.html
+        https://bugs.webkit.org/show_bug.cgi?id=30440
+
+        Reimplement WebCore::defaultLanguage to account for changes in
+        locale done by setLocale.
+
+        Already existing test: fast/js/navigator-language.html
+
+        * platform/gtk/Language.cpp:
+        (WebCore::defaultLanguage):
+
 2009-10-28  Eric Carlson  <eric.carlson@apple.com>
 

trunk/WebCore/platform/gtk/Language.cpp

@@ -22 +22 @@
 
 #include "CString.h"
+#include "GOwnPtr.h"
 #include "PlatformString.h"
 
 #include <gtk/gtk.h>
+#include <locale.h>
 #include <pango/pango.h>
 
 namespace WebCore {
 
+// Using pango_language_get_default() here is not an option, because
+// it doesn't support changing the locale in runtime, so it returns
+// always the same value.
 String defaultLanguage()
 {
-    return pango_language_to_string(gtk_get_default_language());
+    char* localeDefault = setlocale(LC_CTYPE, NULL);
+
+    if (!localeDefault)
+        return String("c");
+
+    GOwnPtr<gchar> normalizedDefault(g_ascii_strdown(localeDefault, -1));
+    char* ptr = strchr(normalizedDefault.get(), '_');
+
+    if(ptr)
+        *ptr = '-';
+
+    ptr = strchr(normalizedDefault.get(), '.');
+
+    if(ptr)
+        *ptr = '\0';
+
+    return String(normalizedDefault.get());
 }