Bug 1345336 - Part 1: Remove empty zoneStrings entries. r=Waldo, a=jcristau
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 13 Mar 2017 13:37:47 +0900
changeset 392857 f7f53f9eaf458380188b1e858247c4247a4bd3d6
parent 392856 6fb7eeaf573e8f25d1cf77900f4daaeb5f90c2c3
child 392858 aa9d94b19b085a1e96cbb1f78c25e57085b68ed3
push id7198
push userjlorenzo@mozilla.com
push dateTue, 18 Apr 2017 12:07:49 +0000
treeherdermozilla-beta@d57aa49c3948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo, jcristau
bugs1345336
milestone54.0a2
Bug 1345336 - Part 1: Remove empty zoneStrings entries. r=Waldo, a=jcristau MozReview-Commit-ID: EuVZ5sgHoBH
intl/icu/source/data/zone/bo.txt
intl/icu/source/data/zone/en_IE.txt
intl/icu/source/data/zone/ii.txt
intl/icu/source/data/zone/uz_Arab.txt
intl/icu/source/data/zone/yi.txt
intl/update-icu.sh
js/src/tests/Intl/DateTimeFormat/format.js
--- a/intl/icu/source/data/zone/bo.txt
+++ b/intl/icu/source/data/zone/bo.txt
@@ -1,7 +1,5 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 bo{
     Version{"2.1.27.40"}
-    zoneStrings{
-    }
 }
--- a/intl/icu/source/data/zone/en_IE.txt
+++ b/intl/icu/source/data/zone/en_IE.txt
@@ -1,8 +1,6 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 en_IE{
     %%Parent{"en_001"}
     Version{"2.1.29.54"}
-    zoneStrings{
-    }
 }
--- a/intl/icu/source/data/zone/ii.txt
+++ b/intl/icu/source/data/zone/ii.txt
@@ -1,7 +1,5 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 ii{
     Version{"2.1.27.40"}
-    zoneStrings{
-    }
 }
--- a/intl/icu/source/data/zone/uz_Arab.txt
+++ b/intl/icu/source/data/zone/uz_Arab.txt
@@ -1,8 +1,6 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 uz_Arab{
     %%Parent{"root"}
     Version{"2.1.27.40"}
-    zoneStrings{
-    }
 }
--- a/intl/icu/source/data/zone/yi.txt
+++ b/intl/icu/source/data/zone/yi.txt
@@ -1,7 +1,5 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 yi{
     Version{"2.1.27.97"}
-    zoneStrings{
-    }
 }
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -42,20 +42,25 @@ find ${icu_dir}/source/data/mappings \
     -name ibm-1047_P100-1995.ucm -prune -or \
     -name '*.ucm' -print | xargs rm
 rm ${icu_dir}/source/data/rbnf/*
 rm ${icu_dir}/source/data/region/*.mk
 rm ${icu_dir}/source/data/region/*.txt
 rm ${icu_dir}/source/data/translit/*
 rm ${icu_dir}/source/data/unit/*.mk
 rm ${icu_dir}/source/data/unit/*.txt
+# bug 1225401 and bug1345336 to remove unused zone name
 find ${icu_dir}/source/data/zone \
     -name root.txt -prune -or \
     -name tzdbNames.txt -prune -or \
     -name '*.txt' -print | xargs sed -i '/^\s\{8\}\"[A-Z]/, /^\s\{8\}}/ { d }'
+find ${icu_dir}/source/data/zone \
+    -name root.txt -prune -or \
+    -name tzdbNames.txt -prune -or \
+    -name '*.txt' -print | xargs sed -i '/^\s\{4\}zoneStrings{/{N; s/^\s\{4\}zoneStrings{\n\s\{4\}}// }; /^$/d'
 
 # Record `svn info`, eliding the line that changes every time the entire ICU
 # repository (not just the path within it we care about) receives a commit.
 # (This ensures that if ICU modifications are performed properly, it's always
 # possible to run the command at the top of this script and make no changes to
 # the tree.)
 svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
 
--- a/js/src/tests/Intl/DateTimeFormat/format.js
+++ b/js/src/tests/Intl/DateTimeFormat/format.js
@@ -28,16 +28,19 @@ assertEq(format.format(date), "๑๒ ธันวาคม ๒๕๕๕ ๐๓:๐๐:๐๐");
 // Locale ja-JP; long format.
 format = new Intl.DateTimeFormat("ja-jp", longFormatOptions);
 assertEq(format.format(date), "2012年12月12日 3:00:00");
 
 // Locale ar-MA; long format, Islamic civilian calendar.
 format = new Intl.DateTimeFormat("ar-ma-u-ca-islamicc", longFormatOptions);
 assertEq(format.format(date), "28 محرم، 1434 03:00:00");
 
+// Locale en-IE: timeZoneName for crash test
+format = new Intl.DateTimeFormat("en-IE", {timeZone: "UTC", timeZoneName: "short"});
+assertEq(format.format(date), "12/12/2012, GMT");
 
 // Test the .name property of the "format" getter.
 var desc = Object.getOwnPropertyDescriptor(Intl.DateTimeFormat.prototype, "format");
 assertEq(desc !== undefined, true);
 assertEq(typeof desc.get, "function");
 assertEq(desc.get.name, "get format");