2012-07-12 12:35:48 +00:00
|
|
|
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
|
2012-07-12 12:33:20 +00:00
|
|
|
case BrowserLanguage:
|
|
|
|
case Language:
|
|
|
|
case UserLanguage:
|
|
|
|
- return jsString(KGlobal::locale()->language());
|
2012-07-12 12:35:48 +00:00
|
|
|
+ {
|
|
|
|
+ QString l = KGlobal::locale()->language();
|
|
|
|
+ if ( l.contains(QLatin1Char('_')) )
|
|
|
|
+ return jsString(l.replace(QLatin1Char('_'), QLatin1Char('-')));
|
|
|
|
+ else
|
|
|
|
+ return jsString(l + QLatin1Char('-') + KGlobal::locale()->country().toUpper());
|
|
|
|
+ }
|
2012-07-12 12:33:20 +00:00
|
|
|
case UserAgent:
|
|
|
|
return jsString(userAgent);
|
|
|
|
case Platform:
|