Change navigator.language dynamically

[Title] Change navigator.language dynamically
[Issue#] N/A
[Problem] navigator.language doesn't change after platform's language is changed.
[Cause] Vector for language values is static.
[Solution] Read vconf value whenever navigator.language is requested.

Change-Id: Ie43ca073889a9e2301e5c6fba183561f0544ab40

diff --git a/Source/WebCore/platform/Language.cpp b/Source/WebCore/platform/Language.cpp
index 47f09f6..d2e0bb0 100644 (file)
--- a/Source/WebCore/platform/Language.cpp
+++ b/Source/WebCore/platform/Language.cpp
@@ -67,7 +67,11 @@ String defaultLanguage()
 
 static Vector<String>& preferredLanguagesOverride()
 {
+#if ENABLE(TIZEN_NAVIGATOR_LANGUAGE_STR)
+    Vector<String>& override = *new Vector<String>();
+#else
     DEFINE_STATIC_LOCAL(Vector<String>, override, ());
+#endif
     return override;
 }
 

diff --git a/Source/WebCore/platform/efl/LanguageEfl.cpp b/Source/WebCore/platform/efl/LanguageEfl.cpp
index 7649aed..6ecda02 100644 (file)
--- a/Source/WebCore/platform/efl/LanguageEfl.cpp
+++ b/Source/WebCore/platform/efl/LanguageEfl.cpp
@@ -32,6 +32,9 @@
 #include "PlatformString.h"
 
 #include <locale.h>
+#if ENABLE(TIZEN_NAVIGATOR_LANGUAGE_STR)
+#include <vconf.h>
+#endif
 #include <wtf/Vector.h>
 
 namespace WebCore {
@@ -39,7 +42,9 @@ namespace WebCore {
 static String platformLanguage()
 {
 #if ENABLE(TIZEN_NAVIGATOR_LANGUAGE_STR)
-    char* localeDefault = setlocale(LC_MESSAGES, 0);
+    char* localeDefault = vconf_get_str(VCONFKEY_LANGSET);
+    if (!localeDefault)
+        setlocale(LC_MESSAGES, 0);
 #else
     char* localeDefault = setlocale(LC_CTYPE, 0);
 #endif