[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 1d65f4c3dceab90bffab68991f78dbca8a6dbff7
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 12 23:33:10 2004 +0000

    	Fixed 3717982.  Implemented navigator.language!
    
            Reviewed by John.
    
            * khtml/ecma/kjs_navigator.cpp:
            (Navigator::getValueProperty):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b3fa2d0..86920d4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-07-12  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3717982.  Implemented navigator.language!
+
+        Reviewed by John.
+
+        * khtml/ecma/kjs_navigator.cpp:
+        (Navigator::getValueProperty):
+
 2004-07-12  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index 1fc7117..4f6c9f4 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -212,8 +212,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     return String("KDE");
 #endif
   case Language:
+#if APPLE_CHANGES
+    // We don't have an implementation of KGlobal::locale().  We do however
+    // have a static method on KLocale to access the current language.
+    return String(KLocale::language());
+#else
     return String(KGlobal::locale()->language() == "C" ?
                   QString::fromLatin1("en") : KGlobal::locale()->language());
+#endif
   case UserAgent:
     return String(userAgent);
   case Platform:

-- 
WebKit Debian packaging