[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

Thu Oct 29 20:48:11 UTC 2009

The following commit has been merged in the webkit-1.1 branch:
commit 662df0c967d17f6b52d26dfdb078c21795583b58
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 22:36:31 2009 +0000

    2009-10-19  Shu Chang  <Chang.Shu at nokia.com>
    
            Reviewed by Eric Seidel.
    
            Language tag should include both language and country sub-tags,
            case insensitive.
            https://bugs.webkit.org/show_bug.cgi?id=30440
    
            * fast/js/navigator-language-expected.txt:
            * fast/js/navigator-language.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49818 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1e6f76b..4643aa1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-19  Shu Chang  <Chang.Shu at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Language tag should include both language and country sub-tags,
+        case insensitive.
+        https://bugs.webkit.org/show_bug.cgi?id=30440
+
+        * fast/js/navigator-language-expected.txt:
+        * fast/js/navigator-language.html:
+
 2009-10-19  Daniel Bates  <dbates at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/fast/js/navigator-language-expected.txt b/LayoutTests/fast/js/navigator-language-expected.txt
index d367428..bcfea32 100644
--- a/LayoutTests/fast/js/navigator-language-expected.txt
+++ b/LayoutTests/fast/js/navigator-language-expected.txt
@@ -1,15 +1,8 @@
 Test for bug 29653: [Qt] Qt-based browser fails to show the right language translation.
-Language tags should follow the specification below:
-2.1.1.  Formatting of Language Tags
-
-   At all times, language tags and their subtags, including private use
-   and extensions, are to be treated as case insensitive: there exist
-   conventions for the capitalization of some of the subtags, but these
-   MUST NOT be taken to carry meaning.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS navigator.language.substring(0,2) is 'en'
+PASS navigator.language.toLowerCase() is 'en-us'
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/fast/js/navigator-language.html b/LayoutTests/fast/js/navigator-language.html
index 4b421af..ecea4da 100644
--- a/LayoutTests/fast/js/navigator-language.html
+++ b/LayoutTests/fast/js/navigator-language.html
@@ -7,16 +7,19 @@
 <body>
 <p id="description"></p>
 <div id="console"></div>
+<!--
+Language tags should follow specification RFC5646:
+http://tools.ietf.org/html/rfc5646
+2.1.1.  Formatting of Language Tags
+
+   At all times, language tags and their subtags, including private use
+   and extensions, are to be treated as case insensitive: there exist
+   conventions for the capitalization of some of the subtags, but these
+   MUST NOT be taken to carry meaning.
+-->
 <script>
 description(
-"<pre>Test for bug 29653: [Qt] Qt-based browser fails to show the right language translation.\n\
-Language tags should follow the specification below:\n\
-2.1.1.  Formatting of Language Tags\n\
-\n\
-   At all times, language tags and their subtags, including private use\n\
-   and extensions, are to be treated as case insensitive: there exist\n\
-   conventions for the capitalization of some of the subtags, but these\n\
-   MUST NOT be taken to carry meaning.</pre>"
+"<pre>Test for bug 29653: [Qt] Qt-based browser fails to show the right language translation."
 );
 
 if (window.layoutTestController) {
@@ -24,7 +27,7 @@ if (window.layoutTestController) {
     layoutTestController.setPOSIXLocale("en_US.iso88591");
 }
 
-shouldBe("navigator.language.substring(0,2)", "'en'");
+shouldBe("navigator.language.toLowerCase()", "'en-us'");
 
 var successfullyParsed = true;
 </script>

-- 
WebKit Debian packaging

