rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

This commit is contained in:
Than Ngo 2012-07-12 14:35:48 +02:00
parent 40c0864bf7
commit 19664638ed
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kdelibs-4.8.4-kjs-locale.patch
View File

@ -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 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.kjs-locale 2012-06-06 22:49:52.542044112 +0200 --- 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-10 23:39:17.508405723 +0200 +++ kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp 2012-07-12 11:52:50.973049316 +0200
@@ -261,7 +261,7 @@ JSValue *Navigator::getValueProperty(Exe @@ -261,7 +261,13 @@ JSValue *Navigator::getValueProperty(Exe
case BrowserLanguage: case BrowserLanguage:
case Language: case Language:
case UserLanguage: case UserLanguage:
- return jsString(KGlobal::locale()->language()); - 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: case UserAgent:
return jsString(userAgent); return jsString(userAgent);
case Platform: case Platform: