diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 27fdf6d626..f11ee957a5 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -11,7 +11,8 @@ Bug Fixes:
* Updated to IANA time zone data 2020a
* Put base option back on ResBundle
* Fixed a few tools and dependencies so that ilib works on node v14
-* Fixed a bug which a default script for ky should be Cyrl instead of Arabic
+* Fixed a default timezone in `my-MM` to `Asia/Yangon`
+* Fixed a bug which a default script for `ky` should be `Cyrl` instead of `Arabic`
Build 009
-------
diff --git a/js/build.xml b/js/build.xml
index 4cc4be2614..370df34e70 100644
--- a/js/build.xml
+++ b/js/build.xml
@@ -53,8 +53,8 @@ limitations under the License.
-
-
+
+
diff --git a/js/data/locale/my/dateformats.json b/js/data/locale/my/dateformats.json
index d58c81f758..c7372d3327 100644
--- a/js/data/locale/my/dateformats.json
+++ b/js/data/locale/my/dateformats.json
@@ -68,31 +68,31 @@
"h": "h",
"m": "mm",
"s": "ss",
- "ah": "B h",
- "hm": "B h:mm",
+ "ah": "a h",
+ "hm": "a h:mm",
"ms": "mm:ss",
- "ahm": "hB h:mm",
- "hms": "B h:mm:ss",
- "hmz": "z B h:mm",
- "ahmz": "z hB h:mm",
- "ahms": "hB h:mm:ss",
- "hmsz": "z B h:mm:ss",
- "ahmsz": "z hB h:mm:ss"
+ "ahm": "a h:mm",
+ "hms": "a h:mm:ss",
+ "hmz": "z a h:mm",
+ "ahmz": "z a h:mm",
+ "ahms": "a h:mm:ss",
+ "hmsz": "z a h:mm:ss",
+ "ahmsz": "z a h:mm:ss"
},
"24": {
"h": "HH",
"m": "mm",
"s": "ss",
"ah": "HH",
- "hm": "B H:mm",
+ "hm": "H:mm",
"ms": "mm:ss",
- "ahm": "B H:mm",
- "hms": "B HH:mm:ss",
- "hmz": "z B H:mm",
- "ahmz": "z B H:mm",
- "ahms": "B HH:mm:ss",
- "hmsz": "z B HH:mm:ss",
- "ahmsz": "z B HH:mm:ss"
+ "ahm": "H:mm",
+ "hms": "HH:mm:ss",
+ "hmz": "z H:mm",
+ "ahmz": "z H:mm",
+ "ahms": "HH:mm:ss",
+ "hmsz": "z HH:mm:ss",
+ "ahmsz": "z HH:mm:ss"
}
},
"range": {
@@ -152,4 +152,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/js/data/locale/und/MM/timezone.jf b/js/data/locale/und/MM/timezone.jf
index 49943b650c..130cfa14b5 100644
--- a/js/data/locale/und/MM/timezone.jf
+++ b/js/data/locale/und/MM/timezone.jf
@@ -1 +1 @@
-{"timezone": "Asia/Rangoon"}
+{"timezone": "Asia/Yangon"}
diff --git a/js/test/date/testDayOfWeek.js b/js/test/date/testDayOfWeek.js
index 75f33e8212..e5d595f743 100644
--- a/js/test/date/testDayOfWeek.js
+++ b/js/test/date/testDayOfWeek.js
@@ -2049,6 +2049,16 @@ module.exports.testweekdata = {
test.equal(info.getWeekEndEnd(), 0);
test.done();
},
+ testWeekData_my_MM: function(test) {
+ test.expect(4);
+ var info = new LocaleInfo("my-MM");
+ test.ok(info !== null);
+
+ test.equal(info.getFirstDayOfWeek(), 0);
+ test.equal(info.getWeekEndStart(), 6);
+ test.equal(info.getWeekEndEnd(), 0);
+ test.done();
+ },
testWeekData_ne_NP: function(test) {
test.expect(4);
var info = new LocaleInfo("ne-NP");
diff --git a/js/test/date/testMeridiems.js b/js/test/date/testMeridiems.js
index 3b0119e044..dfd97c6fcb 100644
--- a/js/test/date/testMeridiems.js
+++ b/js/test/date/testMeridiems.js
@@ -2058,6 +2058,16 @@ module.exports.testmeridiems = {
test.equal(fmt[0].name, "पूर्वाह्न");
test.equal(fmt[1].name, "अपराह्न");
+ test.done();
+ },
+ testMeridiem_my_MM: function(test) {
+ test.expect(3);
+ var fmt = DateFmt.getMeridiemsRange({locale:"my-MM"});
+ test.ok(fmt !== null);
+
+ test.equal(fmt[0].name, 'နံနက်');
+ test.equal(fmt[1].name, 'ညနေ');
+
test.done();
}
}
\ No newline at end of file
diff --git a/js/test/date/testMonthTranslation.js b/js/test/date/testMonthTranslation.js
index 144a986503..9357f1b775 100644
--- a/js/test/date/testMonthTranslation.js
+++ b/js/test/date/testMonthTranslation.js
@@ -7690,6 +7690,51 @@ module.exports.testmonthtranslation = {
test.equal(value[10], "नोभेम्बर");
test.equal(value[11], "डिसेम्बर");
+ test.done();
+ },
+ testMonthTranslate_my_MM: function(test) {
+ test.expect(24);
+
+ // full, long: MMMM
+ // medium: MMM
+ // short: MM
+
+ var value = [], i;
+ var fmt = new DateFmt({locale:"my-MM", date:"m", length: "full", useNative:false, timezone:"local"})
+ for (i=0; i < 12; i++) {
+ value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
+ }
+ test.equal(value[0], "ဇန်နဝါရီ");
+ test.equal(value[1], "ဖေဖော်ဝါရီ");
+ test.equal(value[2], "မတ်");
+ test.equal(value[3], "ဧပြီ");
+ test.equal(value[4], "မေ");
+ test.equal(value[5], "ဇွန်");
+ test.equal(value[6], "ဇူလိုင်");
+ test.equal(value[7], "ဩဂုတ်");
+ test.equal(value[8], "စက်တင်ဘာ");
+ test.equal(value[9], "အောက်တိုဘာ");
+ test.equal(value[10], "နိုဝင်ဘာ");
+ test.equal(value[11], "ဒီဇင်ဘာ");
+
+ var fmt = new DateFmt({locale:"my-MM", date:"m", length: "medium", useNative:false, timezone:"local"})
+ for (i=0; i < 12; i++) {
+ value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
+ }
+
+ test.equal(value[0], "ဇန်");
+ test.equal(value[1], "ဖေ");
+ test.equal(value[2], "မတ်");
+ test.equal(value[3], "ဧ");
+ test.equal(value[4], "မေ");
+ test.equal(value[5], "ဇွန်");
+ test.equal(value[6], "ဇူ");
+ test.equal(value[7], "ဩ");
+ test.equal(value[8], "စက်");
+ test.equal(value[9], "အောက်");
+ test.equal(value[10], "နို");
+ test.equal(value[11], "ဒီ");
+
test.done();
}
}
diff --git a/js/test/date/testSuite.html b/js/test/date/testSuite.html
index 7ce652766d..3aa3e5948c 100644
--- a/js/test/date/testSuite.html
+++ b/js/test/date/testSuite.html
@@ -97,6 +97,7 @@
+
@@ -132,4 +133,4 @@
nodeunit.run(module.exports);