Updated test402 main page to reflect that ECMA-402 is now an approved standard.

Fixed a property access in 6.4_c so that the error message shows the correct expected value.

5 files changed, 15 insertions, 7 deletions

diff --git a/test/suite/intl402/ch06/6.4/6.4_c.js b/test/suite/intl402/ch06/6.4/6.4_c.js
index 75bcdbd80..a9969b648 100644
--- a/test/suite/intl402/ch06/6.4/6.4_c.js
+++ b/test/suite/intl402/ch06/6.4/6.4_c.js
@@ -24,7 +24,7 @@ Object.getOwnPropertyNames(additionalTimeZoneNames).forEach(function (name) {
     }
     if (error === undefined) {
         var actual = format.resolvedOptions().timeZone;
-        var expected = additionalTimeZoneNames.name;
+        var expected = additionalTimeZoneNames[name];
         if (actual !== expected) {
             $ERROR("Time zone name " + name + " was accepted, but incorrectly canonicalized to " +
                 actual + "; expected " + expected + ".");
diff --git a/tools/packaging/templates/runner.intl402.html b/tools/packaging/templates/runner.intl402.html
index a4b1695bb..11f8321f0 100644
--- a/tools/packaging/templates/runner.intl402.html
+++ b/tools/packaging/templates/runner.intl402.html
@@ -68,8 +68,12 @@
                 <p class="headers">What is the ECMAScript Internationalization API?</p>

                 <p class="content">The ECMAScript Internationalization API is a complement to the ECMAScript Language Specification, 5.1 edition.

                     It enables internationalization of JavaScript applications by providing collation (string comparison), number formatting, and date and time formatting, and lets applications choose the language and tailor the functionality to their needs.

-                    The specification is currently under development and likely to become standard ECMA-402.

-                    Current drafts of the specification are available on the <a href='javascript:void(window.open("http://wiki.ecmascript.org/doku.php?id=globalization:specification_drafts"));'>ECMAScript web site</a>.</p>

+                    The ECMAScript Internationalization API Specification 1.0 was approved as an official Ecma standard by the Ecma General Assembly in December 2012.

+                    The ECMAScript Internationalization 1.0 standard is available in

+                    <a href='javascript:void(window.open("http://www.ecma-international.org/ecma-402/1.0/ECMA-402.pdf"));'>PDF</a>,

+                    <a href='javascript:void(window.open("http://www.ecma-international.org/ecma-402/1.0/"));'>HTML</a>, and

+                    <a href='javascript:void(window.open("http://www.ecma-international.org/ecma-402/1.0/ECMA-402.epub"));'>EPUB</a>

+                    versions from the Ecma International web site.</p>

                 <p class="headers">What is ECMAScript?</p>

                 <p class="content">"ECMAScript" is the name under which the language more commonly known as "JavaScript" is standardized. Development of the ECMAScript standard is the responsibility of <a href='javascript:void(window.open("http://www.ecma-international.org/memento/TC39.htm"));'>Technical Committee 39 (TC39)</a> of <a href='javascript:void(window.open("http://www.ecma-international.org/"));'>Ecma International</a>.

                     The ECMAScript Language Specification standard is officially known as ECMA-262.

diff --git a/website/json/intl402.json b/website/json/intl402.json
index c653e4d4d..f34c27505 100644
--- a/website/json/intl402.json
+++ b/website/json/intl402.json
@@ -68,7 +68,7 @@
 },
 {
 "author":"Norbert Lindenberg",
-"code":"Ly8gQ29weXJpZ2h0IDIwMTIgTW96aWxsYSBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLyoqCiAqIEBkZXNjcmlwdGlvbiBUZXN0cyB0aGF0IGFkZGl0aW9uYWwgdGltZSB6b25lIG5hbWVzLCBpZiBhY2NlcHRlZCwgYXJlIGhhbmRsZWQgY29ycmVjdGx5LgogKiBAYXV0aG9yIE5vcmJlcnQgTGluZGVuYmVyZwogKi8KCi8vIGNhbm9uaWNhbGl6YXRpb24gc3BlY2lmaWVkIGluIGNvbmZvcm1hbmNlIGNsYXVzZQp2YXIgYWRkaXRpb25hbFRpbWVab25lTmFtZXMgPSB7CiAgICAiRXRjL0dNVCI6ICJVVEMiLAogICAgIkdyZWVud2ljaCI6ICJVVEMiLAogICAgIlBSQyI6ICJBc2lhL1NoYW5naGFpIiwKICAgICJBbUVySWNBL0xvU19hTmdFbEVzIjogIkFtZXJpY2EvTG9zX0FuZ2VsZXMiLAogICAgImV0Yy9nbXQrNyI6ICJFdGMvR01UKzciCn07CgpPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhhZGRpdGlvbmFsVGltZVpvbmVOYW1lcykuZm9yRWFjaChmdW5jdGlvbiAobmFtZSkgewogICAgdmFyIGZvcm1hdCwgZXJyb3I7CiAgICB0cnkgewogICAgICAgIGZvcm1hdCA9IG5ldyBJbnRsLkRhdGVUaW1lRm9ybWF0KFtdLCB7dGltZVpvbmU6IG5hbWV9KTsKICAgIH0gY2F0Y2ggKGUpIHsKICAgICAgICBlcnJvciA9IGU7CiAgICB9CiAgICBpZiAoZXJyb3IgPT09IHVuZGVmaW5lZCkgewogICAgICAgIHZhciBhY3R1YWwgPSBmb3JtYXQucmVzb2x2ZWRPcHRpb25zKCkudGltZVpvbmU7CiAgICAgICAgdmFyIGV4cGVjdGVkID0gYWRkaXRpb25hbFRpbWVab25lTmFtZXMubmFtZTsKICAgICAgICBpZiAoYWN0dWFsICE9PSBleHBlY3RlZCkgewogICAgICAgICAgICAkRVJST1IoIlRpbWUgem9uZSBuYW1lICIgKyBuYW1lICsgIiB3YXMgYWNjZXB0ZWQsIGJ1dCBpbmNvcnJlY3RseSBjYW5vbmljYWxpemVkIHRvICIgKwogICAgICAgICAgICAgICAgYWN0dWFsICsgIjsgZXhwZWN0ZWQgIiArIGV4cGVjdGVkICsgIi4iKTsKICAgICAgICB9CiAgICB9IGVsc2UgaWYgKGVycm9yLm5hbWUgIT09ICJSYW5nZUVycm9yIikgewogICAgICAgICRFUlJPUigiVGltZSB6b25lIG5hbWUgIiArIG5hbWUgKyAiIHdhcyByZWplY3RlZCB3aXRoIHdyb25nIGVycm9yICIgKyBlcnJvci5uYW1lICsgIi4iKTsKICAgIH0KfSk7Cgo=",
+"code":"Ly8gQ29weXJpZ2h0IDIwMTIgTW96aWxsYSBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLyoqCiAqIEBkZXNjcmlwdGlvbiBUZXN0cyB0aGF0IGFkZGl0aW9uYWwgdGltZSB6b25lIG5hbWVzLCBpZiBhY2NlcHRlZCwgYXJlIGhhbmRsZWQgY29ycmVjdGx5LgogKiBAYXV0aG9yIE5vcmJlcnQgTGluZGVuYmVyZwogKi8KCi8vIGNhbm9uaWNhbGl6YXRpb24gc3BlY2lmaWVkIGluIGNvbmZvcm1hbmNlIGNsYXVzZQp2YXIgYWRkaXRpb25hbFRpbWVab25lTmFtZXMgPSB7CiAgICAiRXRjL0dNVCI6ICJVVEMiLAogICAgIkdyZWVud2ljaCI6ICJVVEMiLAogICAgIlBSQyI6ICJBc2lhL1NoYW5naGFpIiwKICAgICJBbUVySWNBL0xvU19hTmdFbEVzIjogIkFtZXJpY2EvTG9zX0FuZ2VsZXMiLAogICAgImV0Yy9nbXQrNyI6ICJFdGMvR01UKzciCn07CgpPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhhZGRpdGlvbmFsVGltZVpvbmVOYW1lcykuZm9yRWFjaChmdW5jdGlvbiAobmFtZSkgewogICAgdmFyIGZvcm1hdCwgZXJyb3I7CiAgICB0cnkgewogICAgICAgIGZvcm1hdCA9IG5ldyBJbnRsLkRhdGVUaW1lRm9ybWF0KFtdLCB7dGltZVpvbmU6IG5hbWV9KTsKICAgIH0gY2F0Y2ggKGUpIHsKICAgICAgICBlcnJvciA9IGU7CiAgICB9CiAgICBpZiAoZXJyb3IgPT09IHVuZGVmaW5lZCkgewogICAgICAgIHZhciBhY3R1YWwgPSBmb3JtYXQucmVzb2x2ZWRPcHRpb25zKCkudGltZVpvbmU7CiAgICAgICAgdmFyIGV4cGVjdGVkID0gYWRkaXRpb25hbFRpbWVab25lTmFtZXNbbmFtZV07CiAgICAgICAgaWYgKGFjdHVhbCAhPT0gZXhwZWN0ZWQpIHsKICAgICAgICAgICAgJEVSUk9SKCJUaW1lIHpvbmUgbmFtZSAiICsgbmFtZSArICIgd2FzIGFjY2VwdGVkLCBidXQgaW5jb3JyZWN0bHkgY2Fub25pY2FsaXplZCB0byAiICsKICAgICAgICAgICAgICAgIGFjdHVhbCArICI7IGV4cGVjdGVkICIgKyBleHBlY3RlZCArICIuIik7CiAgICAgICAgfQogICAgfSBlbHNlIGlmIChlcnJvci5uYW1lICE9PSAiUmFuZ2VFcnJvciIpIHsKICAgICAgICAkRVJST1IoIlRpbWUgem9uZSBuYW1lICIgKyBuYW1lICsgIiB3YXMgcmVqZWN0ZWQgd2l0aCB3cm9uZyBlcnJvciAiICsgZXJyb3IubmFtZSArICIuIik7CiAgICB9Cn0pOwoK",
 "commentary":"",
 "description":"Tests that additional time zone names, if accepted, are handled correctly.",
 "path":"TestCases/intl402/ch06/6.4/6.4_c.js"
diff --git a/website/json/suiteDescrip.json b/website/json/suiteDescrip.json
index f3c489a00..6e8df4c9c 100644
--- a/website/json/suiteDescrip.json
+++ b/website/json/suiteDescrip.json
@@ -1 +1 @@
-{"date":"2012-11-05","version":"ES5.1"}
\ No newline at end of file
+{"date":"2012-12-17","version":"ES5.1"}
\ No newline at end of file
diff --git a/website/testcases_intl402.html b/website/testcases_intl402.html
index 376f3a215..c2ffed526 100644
--- a/website/testcases_intl402.html
+++ b/website/testcases_intl402.html
@@ -68,8 +68,12 @@
                 <p class="headers">What is the ECMAScript Internationalization API?</p>

                 <p class="content">The ECMAScript Internationalization API is a complement to the ECMAScript Language Specification, 5.1 edition.

                     It enables internationalization of JavaScript applications by providing collation (string comparison), number formatting, and date and time formatting, and lets applications choose the language and tailor the functionality to their needs.

-                    The specification is currently under development and likely to become standard ECMA-402.

-                    Current drafts of the specification are available on the <a href='javascript:void(window.open("http://wiki.ecmascript.org/doku.php?id=globalization:specification_drafts"));'>ECMAScript web site</a>.</p>

+                    The ECMAScript Internationalization API Specification 1.0 was approved as an official Ecma standard by the Ecma General Assembly in December 2012.

+                    The ECMAScript Internationalization 1.0 standard is available in

+                    <a href='javascript:void(window.open("http://www.ecma-international.org/ecma-402/1.0/ECMA-402.pdf"));'>PDF</a>,

+                    <a href='javascript:void(window.open("http://www.ecma-international.org/ecma-402/1.0/"));'>HTML</a>, and

+                    <a href='javascript:void(window.open("http://www.ecma-international.org/ecma-402/1.0/ECMA-402.epub"));'>EPUB</a>

+                    versions from the Ecma International web site.</p>

                 <p class="headers">What is ECMAScript?</p>

                 <p class="content">"ECMAScript" is the name under which the language more commonly known as "JavaScript" is standardized. Development of the ECMAScript standard is the responsibility of <a href='javascript:void(window.open("http://www.ecma-international.org/memento/TC39.htm"));'>Technical Committee 39 (TC39)</a> of <a href='javascript:void(window.open("http://www.ecma-international.org/"));'>Ecma International</a>.

                     The ECMAScript Language Specification standard is officially known as ECMA-262.