From 19664638edf272584582b5a1374219bb76d3185a Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Thu, 12 Jul 2012 14:35:48 +0200
Subject: [PATCH] update

---
 kdelibs-4.8.4-kjs-locale.patch | 16 +++++++++++-----
 1 file 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: