[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:53:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2129673eb779906ec0224a7a0b0256e207cdf636
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 14:40:09 2010 +0000
2010-10-23 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Reviewed by David Kilzer.
[EFL] Implement platformDefaultLanguage()
https://bugs.webkit.org/show_bug.cgi?id=48113
Implement the platformDefaultLanguage() function for EFL port.
* platform/efl/LanguageEfl.cpp:
(WebCore::platformDefaultLanguage):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70388 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e41ee02..b997462 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-23 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Reviewed by David Kilzer.
+
+ [EFL] Implement platformDefaultLanguage()
+ https://bugs.webkit.org/show_bug.cgi?id=48113
+
+ Implement the platformDefaultLanguage() function for EFL port.
+
+ * platform/efl/LanguageEfl.cpp:
+ (WebCore::platformDefaultLanguage):
+
2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70367.
diff --git a/WebCore/platform/efl/LanguageEfl.cpp b/WebCore/platform/efl/LanguageEfl.cpp
index 4b765a6..efed862 100644
--- a/WebCore/platform/efl/LanguageEfl.cpp
+++ b/WebCore/platform/efl/LanguageEfl.cpp
@@ -29,15 +29,25 @@
#include "config.h"
#include "Language.h"
-#include "NotImplemented.h"
#include "PlatformString.h"
+#include <locale.h>
+
namespace WebCore {
String platformDefaultLanguage()
{
- notImplemented();
- return String();
+ char* localeDefault = setlocale(LC_CTYPE, 0);
+
+ if (!localeDefault)
+ return String("c");
+
+ char* ptr = strchr(localeDefault, '_');
+
+ if (ptr)
+ *ptr = '-';
+
+ return String(localeDefault);
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list