[kdelibs] update
Than Ngo
than at fedoraproject.org
Thu Jul 12 12:36:14 UTC 2012
commit 19664638edf272584582b5a1374219bb76d3185a
Author: Than Ngo <than at redhat.com>
Date: Thu Jul 12 14:35:48 2012 +0200
update
kdelibs-4.8.4-kjs-locale.patch | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/kdelibs-4.8.4-kjs-locale.patch b/kdelibs-4.8.4-kjs-locale.patch
index cc60981..74ba0f9 100644
--- a/kdelibs-4.8.4-kjs-locale.patch
+++ b/kdelibs-4.8.4-kjs-locale.patch
@@ -1,12 +1,18 @@
-diff -up kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp.kjs-locale kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp
---- kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp.kjs-locale 2012-06-06 22:49:52.542044112 +0200
-+++ kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp 2012-07-10 23:39:17.508405723 +0200
-@@ -261,7 +261,7 @@ JSValue *Navigator::getValueProperty(Exe
+diff -up kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp.me kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp
+--- kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp.me 2012-06-06 22:49:52.542044112 +0200
++++ kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp 2012-07-12 11:52:50.973049316 +0200
+@@ -261,7 +261,13 @@ JSValue *Navigator::getValueProperty(Exe
case BrowserLanguage:
case Language:
case UserLanguage:
- return jsString(KGlobal::locale()->language());
-+ return jsString(KGlobal::locale()->language().replace(QLatin1Char('_'), QLatin1Char('-')));
++ {
++ QString l = KGlobal::locale()->language();
++ if ( l.contains(QLatin1Char('_')) )
++ return jsString(l.replace(QLatin1Char('_'), QLatin1Char('-')));
++ else
++ return jsString(l + QLatin1Char('-') + KGlobal::locale()->country().toUpper());
++ }
case UserAgent:
return jsString(userAgent);
case Platform:
More information about the scm-commits
mailing list