diff --git a/js/data/locale/af/sysres.json b/js/data/locale/af/sysres.json
index 918ea04cba..e1cae171dc 100644
--- a/js/data/locale/af/sysres.json
+++ b/js/data/locale/af/sysres.json
@@ -87,24 +87,24 @@
     "1#1 week|#{num} weeks": "one#{num} week|#{num} weke",
     "1#1 month|#{num} months": "one#{num} maand|#{num} maande",
     "1#1 year|#{num} years": "one#{num} jaar|#{num} jaar",
-    "#{num} ms": "one#{num} ms|#{num} ms",
-    "1#1 sec|#{num} sec": "one#{num} sek.|#{num} sek.",
+    "#{num} ms": "one#{num} ms.|#{num} ms",
+    "1#1 sec|#{num} sec": "one#{num} s.|#{num} s.",
     "1#1 min|#{num} min": "one#{num} min.|#{num} min.",
     "1#1 hr|#{num} hrs": "one#{num} u.|#{num} u.",
     "durationLongDays": "one#{num} dag|#{num} dae",
     "1#1 wk|#{num} wks": "one#{num} w.|#{num} w.",
     "1#1 mon|#{num} mons": "one#{num} md.|#{num} md.",
     "1#1 yr|#{num} yrs": "one#{num} j.|#{num} j.",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "1#1 se|#{num} sec": "one#{num} sek.|#{num} sek.",
+    "durationMediumMillis": "one#{num} ms.|#{num} ms.",
+    "1#1 se|#{num} sec": "one#{num} s.|#{num} s.",
     "1#1 mi|#{num} min": "one#{num} min.|#{num} min.",
     "durationMediumHours": "one#{num} u.|#{num} u.",
     "1#1 dy|#{num} dys": "one#{num} d.|#{num} d.",
     "durationMediumWeeks": "one#{num} w.|#{num} w.",
     "1#1 mo|#{num} mos": "one#{num} md.|#{num} md.",
     "durationMediumYears": "one#{num} j.|#{num} j.",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "#{num}s": "one#{num} sek.|#{num} sek.",
+    "durationShortMillis": "one#{num} ms.|#{num} ms.",
+    "#{num}s": "one#{num} s.|#{num} s.",
     "durationShortMinutes": "one#{num} min.|#{num} min.",
     "#{num}h": "one#{num} u.|#{num} u.",
     "#{num}d": "one#{num} d.|#{num} d.",
diff --git a/js/data/locale/am/sysres.json b/js/data/locale/am/sysres.json
index 4cd646f979..b5b1164f6d 100644
--- a/js/data/locale/am/sysres.json
+++ b/js/data/locale/am/sysres.json
@@ -81,9 +81,6 @@
     "E6-ethiopic": "ቅ",
     "a0-ethiopic": "ጥዋት",
     "a1-ethiopic": "ቀትር",
-    "a2-ethiopic": "ከሰዓት",
-    "a3-ethiopic": "ከምሽቱ",
-    "a4-ethiopic": "ከሌሊቱ",
     "MMMM1": "ጃንዩወሪ",
     "MMM1": "ጃንዩ",
     "NN1": "ጃን",
@@ -245,5 +242,8 @@
     "separatorMedium": "፣ ",
     "finalSeparatorMedium": "፣ ",
     "separatorShort": "፣ ",
-    "finalSeparatorShort": " "
-}
+    "finalSeparatorShort": " ",
+    "a2-ethiopic": "ከሰዓት",
+    "a3-ethiopic": "ከምሽቱ",
+    "a4-ethiopic": "ከሌሊቱ"
+}
\ No newline at end of file
diff --git a/js/data/locale/ar/SA/sysres.json b/js/data/locale/ar/SA/sysres.json
new file mode 100644
index 0000000000..826a86097f
--- /dev/null
+++ b/js/data/locale/ar/SA/sysres.json
@@ -0,0 +1,8 @@
+{
+    "1#1 second|#{num} seconds": "zero#{num} ثانية|one#ثانية|two#ثانيتان|few#{num} ثوانٍ|many#{num} ثانية|#{num} ثانية",
+    "1#1 yr|#{num} yrs": "zero#{num} سنة|one#سنة|two#سنتان|few#{num} سنوات|many#{num} سنة|#{num} سنة",
+    "1#1 mo|#{num} mos": "zero#{num} شهر|one#شهر|two#شهران|few#{num} أشهر|many#{num} شهرًا|#{num} شهر",
+    "durationMediumYears": "zero#{num} سنة|one#سنة|two#سنتان|few#{num} سنوات|many#{num} سنة|#{num} سنة",
+    "durationShortMonths": "zero#{num} شهر|one#شهر|two#شهران|few#{num} أشهر|many#{num} شهرًا|#{num} شهر",
+    "#{num}y": "zero#{num} سنة|one#سنة|two#سنتان|few#{num} سنوات|many#{num} سنة|#{num} سنة"
+}
\ No newline at end of file
diff --git a/js/data/locale/ar/sysres.json b/js/data/locale/ar/sysres.json
index d171636b58..a1a69b8bbe 100644
--- a/js/data/locale/ar/sysres.json
+++ b/js/data/locale/ar/sysres.json
@@ -91,17 +91,17 @@
     "1#1 sec|#{num} sec": "zero#{num} ث|one#{num} ث|two#{num} ث|few#{num} ث|many#{num} ث|#{num} ث",
     "1#1 min|#{num} min": "zero#{num} د|one#{num} د|two#{num} د|few#{num} د|many#{num} د|#{num} د",
     "1#1 hr|#{num} hrs": "zero#{num} س|one#{num} س|two#{num} س|few#{num} س|many#{num} س|#{num} س",
-    "durationLongDays": "zero#{num} يوم|one#يوم|two#يومان|few#{num} يوم|many#{num} يوم|#{num} يوم",
+    "durationLongDays": "zero#{num} يوم|one#يوم|two#يومان|few#{num} أيام|many#{num} يومًا|#{num} يوم",
     "1#1 wk|#{num} wks": "zero#{num} أسبوع|one#أسبوع|two#أسبوعان|few#{num} أسابيع|many#{num} أسبوعًا|#{num} أسبوع",
-    "1#1 mon|#{num} mons": "zero#{num} شهر|one#شهر|two#{num} شهر|few#{num} شهر|many#{num} شهر|#{num} شهر",
-    "1#1 yr|#{num} yrs": "zero#{num} سنة|one#سنة واحدة|two#سنتان|few#{num} سنة|many#{num} سنة|#{num} سنة",
+    "1#1 mon|#{num} mons": "zero#{num} شهر|one#شهر|two#شهران|few#{num} أشهر|many#{num} شهرًا|#{num} شهر",
+    "1#1 yr|#{num} yrs": "zero#{num} سنة|one#سنة واحدة|two#سنتان|few#{num} سنوات|many#{num} سنة|#{num} سنة",
     "durationMediumMillis": "zero#{num} ملي ث|one#{num} ملي ث|two#{num} ملي ث|few#{num} ملي ث|many#{num} ملي ث|#{num} ملي ث",
     "1#1 se|#{num} sec": "zero#{num} ث|one#{num} ث|two#{num} ث|few#{num} ث|many#{num} ث|#{num} ث",
     "1#1 mi|#{num} min": "zero#{num} د|one#{num} د|two#{num} د|few#{num} د|many#{num} د|#{num} د",
     "durationMediumHours": "zero#{num} س|one#{num} س|two#{num} س|few#{num} س|many#{num} س|#{num} س",
     "1#1 dy|#{num} dys": "zero#{num} ي|one#{num} ي|two#{num} ي|few#{num} ي|many#{num} ي|#{num} ي",
     "durationMediumWeeks": "zero#{num} أ|one#{num} أ|two#{num} أ|few#{num} أ|many#{num} أ|#{num} أ",
-    "1#1 mo|#{num} mos": "zero#{num} شهر|one#{num} شهر|two#{num} شهر|few#{num} شهر|many#{num} شهر|#{num} شهر",
+    "1#1 mo|#{num} mos": "zero#{num} شهر|one#شهر|two#شهران|few#{num} شهر|many#{num} شهر|#{num} شهر",
     "durationMediumYears": "zero#{num} سنة|one#{num} سنة|two#{num} سنة|few#{num} سنة|many#{num} سنة|#{num} سنة",
     "durationShortMillis": "zero#{num} ملي ث|one#{num} ملي ث|two#{num} ملي ث|few#{num} ملي ث|many#{num} ملي ث|#{num} ملي ث",
     "#{num}s": "zero#{num} ث|one#{num} ث|two#{num} ث|few#{num} ث|many#{num} ث|#{num} ث",
@@ -109,7 +109,7 @@
     "#{num}h": "zero#{num} س|one#{num} س|two#{num} س|few#{num} س|many#{num} س|#{num} س",
     "#{num}d": "zero#{num} ي|one#{num} ي|two#{num} ي|few#{num} ي|many#{num} ي|#{num} ي",
     "#{num}w": "zero#{num} أ|one#{num} أ|two#{num} أ|few#{num} أ|many#{num} أ|#{num} أ",
-    "durationShortMonths": "zero#{num} شهر|one#{num} شهر|two#{num} شهر|few#{num} شهر|many#{num} شهر|#{num} شهر",
+    "durationShortMonths": "zero#{num} شهر|one#شهر|two#شهران|few#{num} شهر|many#{num} شهر|#{num} شهر",
     "#{num}y": "zero#{num} سنة|one#{num} سنة|two#{num} سنة|few#{num} سنة|many#{num} سنة|#{num} سنة",
     "1#in 1 second|#in {num} seconds": "zero#‏خلال {num} ثانية|one#‏خلال ثانية واحدة|two#‏خلال ثانيتين|few#‏خلال {num} ثوانٍ|many#‏خلال {num} ثانية|#‏خلال {num} ثانية",
     "1#in 1 minute|#in {num} minutes": "zero#‏خلال {num} دقيقة|one#‏خلال دقيقة واحدة|two#‏خلال دقيقتين|few#‏خلال {num} دقائق|many#‏خلال {num} دقيقة|#‏خلال {num} دقيقة",
@@ -159,6 +159,6 @@
     "finalSeparatorLong": "، و",
     "separatorMedium": "، و",
     "finalSeparatorMedium": "، و",
-    "separatorShort": "، ",
-    "finalSeparatorShort": "، "
+    "separatorShort": " و",
+    "finalSeparatorShort": " و"
 }
\ No newline at end of file
diff --git a/js/data/locale/az/sysres.json b/js/data/locale/az/sysres.json
index 32c00c2c7b..025d47a933 100644
--- a/js/data/locale/az/sysres.json
+++ b/js/data/locale/az/sysres.json
@@ -47,7 +47,7 @@
     "MMM12": "dek",
     "NN12": "de",
     "N12": "d",
-    "LLLL1": "Yanvar",
+    "LLLL1": "yanvar",
     "LLL1": "yan",
     "LL1": "ya",
     "L1": "1",
@@ -55,7 +55,7 @@
     "LLL2": "fev",
     "LL2": "fe",
     "L2": "2",
-    "LLLL3": "Mart",
+    "LLLL3": "mart",
     "LLL3": "mar",
     "LL3": "ma",
     "L3": "3",
@@ -91,7 +91,7 @@
     "LLL11": "noy",
     "LL11": "no",
     "L11": "11",
-    "LLLL12": "Dekabr",
+    "LLLL12": "dekabr",
     "LLL12": "dek",
     "LL12": "de",
     "L12": "12",
@@ -100,11 +100,11 @@
     "EE0": "B.",
     "E0": "7",
     "EEEE1": "bazar ertəsi",
-    "EEE1": "B.E.",
+    "EEE1": "B.e.",
     "EE1": "B.E.",
     "E1": "1",
     "EEEE2": "çərşənbə axşamı",
-    "EEE2": "Ç.A.",
+    "EEE2": "Ç.a.",
     "EE2": "Ç.A.",
     "E2": "2",
     "EEEE3": "çərşənbə",
@@ -112,7 +112,7 @@
     "EE3": "Ç.",
     "E3": "3",
     "EEEE4": "cümə axşamı",
-    "EEE4": "C.A.",
+    "EEE4": "C.a.",
     "EE4": "C.A.",
     "E4": "4",
     "EEEE5": "cümə",
diff --git a/js/data/locale/be/sysres.json b/js/data/locale/be/sysres.json
index 8a81e3690f..e57dba01ee 100644
--- a/js/data/locale/be/sysres.json
+++ b/js/data/locale/be/sysres.json
@@ -153,8 +153,8 @@
     "c6": "с",
     "a0": "AM",
     "a1": "PM",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "да н.э.",
+    "G1": "н.э.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} мілісекунда|few#{num} мілісекунды|many#{num} мілісекунд|#{num} мілісекунды",
     "1#1 second|#{num} seconds": "one#{num} секунда|few#{num} секунды|many#{num} секунд|#{num} секунды",
     "1#1 minute|#{num} minutes": "one#{num} хвіліна|few#{num} хвіліны|many#{num} хвілін|#{num} хвіліны",
diff --git a/js/data/locale/bg/dateformats.json b/js/data/locale/bg/dateformats.json
index 06ef3a7cde..3dd24321a4 100644
--- a/js/data/locale/bg/dateformats.json
+++ b/js/data/locale/bg/dateformats.json
@@ -68,31 +68,31 @@
                 "h": "h",
                 "m": "mm",
                 "s": "ss",
-                "ah": "h 'ч'. a",
-                "hm": "h:mm 'ч'.",
+                "ah": "h a",
+                "hm": "h:mm",
                 "ms": "mm:ss",
-                "ahm": "h:mm 'ч'. a",
-                "hms": "h:mm:ss 'ч'.",
-                "hmz": "h:mm 'ч'. z",
-                "ahmz": "h:mm 'ч'. a z",
-                "ahms": "h:mm:ss 'ч'. a",
-                "hmsz": "h:mm:ss 'ч'. z",
-                "ahmsz": "h:mm:ss 'ч'. a z"
+                "ahm": "h:mm a",
+                "hms": "h:mm:ss",
+                "hmz": "h:mm z",
+                "ahmz": "h:mm a z",
+                "ahms": "h:mm:ss a",
+                "hmsz": "h:mm:ss z",
+                "ahmsz": "h:mm:ss a z"
             },
             "24": {
                 "h": "H",
                 "m": "mm",
                 "s": "ss",
                 "ah": "H",
-                "hm": "H:mm 'ч'.",
+                "hm": "H:mm",
                 "ms": "mm:ss",
-                "ahm": "H:mm 'ч'.",
-                "hms": "H:mm:ss 'ч'.",
-                "hmz": "H:mm 'ч'. z",
-                "ahmz": "H:mm 'ч'. z",
-                "ahms": "H:mm:ss 'ч'.",
-                "hmsz": "H:mm:ss 'ч'. z",
-                "ahmsz": "H:mm:ss 'ч'. z"
+                "ahm": "H:mm",
+                "hms": "H:mm:ss",
+                "hmz": "H:mm z",
+                "ahmz": "H:mm z",
+                "ahms": "H:mm:ss",
+                "hmsz": "H:mm:ss z",
+                "ahmsz": "H:mm:ss z"
             }
         },
         "range": {
diff --git a/js/data/locale/bg/sysres.json b/js/data/locale/bg/sysres.json
index 9154c8de5c..7ced8935b1 100644
--- a/js/data/locale/bg/sysres.json
+++ b/js/data/locale/bg/sysres.json
@@ -102,7 +102,7 @@
     "1#1 dy|#{num} dys": "one#{num} д|#{num} д",
     "durationMediumWeeks": "one#{num} седм.|#{num} седм.",
     "1#1 mo|#{num} mos": "one#{num} мес.|#{num} мес.",
-    "durationMediumYears": "one#{num} г|#{num} г",
+    "durationMediumYears": "one#{num} г.|#{num} г.",
     "durationShortMillis": "one#{num} мсек|#{num} мсек",
     "#{num}s": "one#{num} с|#{num} с",
     "durationShortMinutes": "one#{num} мин|#{num} мин",
@@ -110,7 +110,7 @@
     "#{num}d": "one#{num} д|#{num} д",
     "#{num}w": "one#{num} седм.|#{num} седм.",
     "durationShortMonths": "one#{num} мес.|#{num} мес.",
-    "#{num}y": "one#{num} г|#{num} г",
+    "#{num}y": "one#{num} г.|#{num} г.",
     "1#in 1 second|#in {num} seconds": "one#след {num} секунда|#след {num} секунди",
     "1#in 1 minute|#in {num} minutes": "one#след {num} минута|#след {num} минути",
     "1#in 1 hour|#in {num} hours": "one#след {num} час|#след {num} часа",
diff --git a/js/data/locale/br/sysres.json b/js/data/locale/br/sysres.json
index 40417423f0..6e56262623 100644
--- a/js/data/locale/br/sysres.json
+++ b/js/data/locale/br/sysres.json
@@ -77,8 +77,8 @@
     "E6": "Sa",
     "a0": "A.M.",
     "a1": "G.M.",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "AAK",
+    "G1": "AK",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milieilenn|two#{num} vilieilenn|few#{num} milieilenn|many#{num} a vilieilennoù|#{num} milieilenn",
     "1#1 second|#{num} seconds": "one#{num} eilenn|two#{num} eilenn|few#{num} eilenn|many#{num} a eilennoù|#{num} eilenn",
     "1#1 minute|#{num} minutes": "one#{num} munut|two#{num} vunut|few#{num} munut|many#{num} a vunutoù|#{num} munut",
@@ -90,27 +90,27 @@
     "#{num} ms": "one#{num} ms|two#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|two#{num} s|few#{num} s|many#{num} s|#{num} s",
     "1#1 min|#{num} min": "one#{num} min|two#{num} min|few#{num} min|many#{num} min|#{num} min",
-    "1#1 hr|#{num} hrs": "one#{num} e|two#{num} e|few#{num} e|many#{num} e|#{num} e",
+    "1#1 hr|#{num} hrs": "one#{num} h|two#{num} h|few#{num} h|many#{num} h|#{num} h",
     "durationLongDays": "one#{num} d|two#{num} d|few#{num} d|many#{num} d|#{num} d",
-    "1#1 wk|#{num} wks": "#{num} w",
-    "1#1 mon|#{num} mons": "one#{num} miz|two#{num} viz|few#{num} miz|many#{num} a vizioù|#{num} miz",
+    "1#1 wk|#{num} wks": "one#{num} sizh.|two#{num} sizh.|few#{num} sizh.|many#{num} sizh.|#{num} sizh.",
+    "1#1 mon|#{num} mons": "one#{num} m.|two#{num} m.|few#{num} m.|many#{num} m.|#{num} m.",
     "1#1 yr|#{num} yrs": "one#{num} bl.|two#{num} bl.|few#{num} bl.|many#{num} bl.|#{num} bl.",
-    "durationMediumMillis": "one#{num} ms|two#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
-    "1#1 se|#{num} sec": "one#{num} s|two#{num} s|few#{num} s|many#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} min|two#{num} min|few#{num} min|many#{num} min|#{num} min",
-    "durationMediumHours": "one#{num} e|two#{num} e|few#{num} e|many#{num} e|#{num} e",
-    "1#1 dy|#{num} dys": "one#{num} d|two#{num} d|few#{num} d|many#{num} d|#{num} d",
-    "durationMediumWeeks": "#{num} w",
-    "1#1 mo|#{num} mos": "one#{num} miz|two#{num} m|few#{num} miz|many#{num} a vizioù|#{num} miz",
-    "durationMediumYears": "one#{num} b|two#{num} b|few#{num} b|many#{num} b|#{num} b",
-    "durationShortMillis": "one#{num} ms|two#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
-    "#{num}s": "one#{num} s|two#{num} s|few#{num} s|many#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} min|two#{num} min|few#{num} min|many#{num} min|#{num} min",
-    "#{num}h": "one#{num} e|two#{num} e|few#{num} e|many#{num} e|#{num} e",
-    "#{num}d": "one#{num} d|two#{num} d|few#{num} d|many#{num} d|#{num} d",
-    "#{num}w": "#{num} w",
-    "durationShortMonths": "one#{num} miz|two#{num} m|few#{num} miz|many#{num} a vizioù|#{num} miz",
-    "#{num}y": "one#{num} b|two#{num} b|few#{num} b|many#{num} b|#{num} b",
+    "durationMediumMillis": "one#{num}ms|two#{num}ms|few#{num}ms|many#{num}ms|#{num}ms",
+    "1#1 se|#{num} sec": "one#{num}s|two#{num}s|few#{num}s|many#{num}s|#{num}s",
+    "1#1 mi|#{num} min": "one#{num}min|two#{num}min|few#{num}min|many#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|two#{num}h|few#{num}h|many#{num}h|#{num}h",
+    "1#1 dy|#{num} dys": "one#{num}d|two#{num}d|few#{num}d|many#{num}d|#{num}d",
+    "durationMediumWeeks": "one#{num}sizh.|two#{num}sizh.|few#{num}sizh.|many#{num}sizh.|#{num}sizh.",
+    "1#1 mo|#{num} mos": "one#{num}m|two#{num}m|few#{num}m|many#{num}m|#{num}m",
+    "durationMediumYears": "one#{num}b|two#{num}b|few#{num}b|many#{num}b|#{num}b",
+    "durationShortMillis": "one#{num}ms|two#{num}ms|few#{num}ms|many#{num}ms|#{num}ms",
+    "#{num}s": "one#{num}s|two#{num}s|few#{num}s|many#{num}s|#{num}s",
+    "durationShortMinutes": "one#{num}min|two#{num}min|few#{num}min|many#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|two#{num}h|few#{num}h|many#{num}h|#{num}h",
+    "#{num}d": "one#{num}d|two#{num}d|few#{num}d|many#{num}d|#{num}d",
+    "#{num}w": "one#{num}sizh.|two#{num}sizh.|few#{num}sizh.|many#{num}sizh.|#{num}sizh.",
+    "durationShortMonths": "one#{num}m|two#{num}m|few#{num}m|many#{num}m|#{num}m",
+    "#{num}y": "one#{num}b|two#{num}b|few#{num}b|many#{num}b|#{num}b",
     "1#in 1 second|#in {num} seconds": "one#a-benn {num} eilenn|two#a-benn {num} eilenn|few#a-benn {num} eilenn|many#a-benn {num} a eilennoù|#a-benn {num} eilenn",
     "1#in 1 minute|#in {num} minutes": "one#a-benn {num} munut|two#a-benn {num} vunut|few#a-benn {num} munut|many#a-benn {num} a vunutoù|#a-benn {num} munut",
     "1#in 1 hour|#in {num} hours": "one#a-benn {num} eur|two#a-benn {num} eur|few#a-benn {num} eur|many#a-benn {num} a eurioù|#a-benn {num} eur",
@@ -129,7 +129,7 @@
     "#in {num}mi": "one#a-benn {num} min|two#a-benn {num} min|few#a-benn {num} min|many#a-benn {num} min|#a-benn {num} min",
     "#in {num}h": "one#a-benn {num} e|two#a-benn {num} e|few#a-benn {num} e|many#a-benn {num} e|#a-benn {num} e",
     "#in {num}d": "one#a-benn {num} d|two#a-benn {num} d|few#a-benn {num} d|many#a-benn {num} d|#a-benn {num} d",
-    "#in {num}w": "one#a-benn {num} sizhun|two#a-benn {num} sizhun|few#a-benn {num} sizhun|many#a-benn {num} a sizhunioù|#a-benn {num} sizhun",
+    "#in {num}w": "one#a-benn {num} sizh.|two#a-benn {num} sizh.|few#a-benn {num} sizh.|many#a-benn {num} sizh.|#a-benn {num} sizh.",
     "#in {num}mo": "one#a-benn {num} miz|two#a-benn {num} viz|few#a-benn {num} miz|many#a-benn {num} a vizioù|#a-benn {num} miz",
     "#in {num}y": "one#a-benn {num} bl.|two#a-benn {num} bl.|few#a-benn {num} bl.|many#a-benn {num} bl.|#a-benn {num} bl.",
     "1#1 second ago|#{num} seconds ago": "one#{num} eilenn zo|two#{num} eilenn zo|few#{num} eilenn zo|many#{num} eilenn zo|#{num} eilenn zo",
@@ -150,7 +150,7 @@
     "#{num}mi ago": "one#{num} min zo|two#{num} min zo|few#{num} min zo|many#{num} min zo|#{num} min zo",
     "#{num}h ago": "one#{num} e zo|two#{num} e zo|few#{num} e zo|many#{num} e zo|#{num} e zo",
     "#{num}d ago": "one#{num} d zo|two#{num} d zo|few#{num} d zo|many#{num} d zo|#{num} d zo",
-    "#{num}w ago": "one#{num} sizhun zo|two#{num} sizhun zo|few#{num} sizhun zo|many#{num} a sizhunioù zo|#{num} sizhun zo",
+    "#{num}w ago": "one#{num} sizh. zo|two#{num} sizh. zo|few#{num} sizh. zo|many#{num} sizh. zo|#{num} sizh. zo",
     "#{num}mo ago": "one#{num} miz zo|two#{num} viz zo|few#{num} miz zo|many#{num} a vizioù zo|#{num} miz zo",
     "#{num}y ago": "one#{num} bl. zo|two#{num} bl. zo|few#{num} bl. zo|many#{num} bl. zo|#{num} bl. zo",
     "separatorFull": ", ",
diff --git a/js/data/locale/brx/dateformats.json b/js/data/locale/brx/dateformats.json
index 3c6557216f..5236af7871 100644
--- a/js/data/locale/brx/dateformats.json
+++ b/js/data/locale/brx/dateformats.json
@@ -130,7 +130,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/bs/Cyrl/dateformats.json b/js/data/locale/bs/Cyrl/dateformats.json
index 4c53b9819a..98fbaf6640 100644
--- a/js/data/locale/bs/Cyrl/dateformats.json
+++ b/js/data/locale/bs/Cyrl/dateformats.json
@@ -65,19 +65,19 @@
         },
         "time": {
             "12": {
-                "h": "hh",
+                "h": "h",
                 "m": "mm",
                 "s": "ss",
-                "ah": "hh a",
-                "hm": "hh:mm",
+                "ah": "h a",
+                "hm": "h:mm",
                 "ms": "mm:ss",
-                "ahm": "hh:mm a",
-                "hms": "hh:mm:ss",
-                "hmz": "hh:mm z",
-                "ahmz": "hh:mm a z",
-                "ahms": "hh:mm:ss a",
-                "hmsz": "hh:mm:ss z",
-                "ahmsz": "hh:mm:ss a z"
+                "ahm": "h:mm a",
+                "hms": "h:mm:ss",
+                "hmz": "h:mm z",
+                "ahmz": "h:mm a z",
+                "ahms": "h:mm:ss a",
+                "hmsz": "h:mm:ss z",
+                "ahmsz": "h:mm:ss a z"
             },
             "24": {
                 "h": "HH",
diff --git a/js/data/locale/bs/Cyrl/sysres.json b/js/data/locale/bs/Cyrl/sysres.json
index 9ed35bf925..a5e1e264a4 100644
--- a/js/data/locale/bs/Cyrl/sysres.json
+++ b/js/data/locale/bs/Cyrl/sysres.json
@@ -75,84 +75,84 @@
     "EEE6": "суб",
     "EE6": "суб",
     "E6": "с",
-    "a0": "пре подне",
-    "a1": "поподне",
+    "a0": "прије подне",
+    "a1": "послије подне",
     "G-1": "BCE",
     "G1": "CE",
-    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 second|#{num} seconds": "one#{num} секунда|few#{num} секунде|#{num} секунда",
-    "1#1 minute|#{num} minutes": "one#{num} минут|few#{num} минута|#{num} минут",
-    "1#1 hour|#{num} hours": "one#{num} сат|few#{num} сата|#{num} сат",
-    "1#1 day|#{num} days": "one#{num} дан|few#{num} дана|#{num} дан",
-    "1#1 week|#{num} weeks": "one#{num} недеља|few#{num} недеље|#{num} недеља",
-    "1#1 month|#{num} months": "one#{num} месец|few#{num} месеца|#{num} месец",
+    "1#1 millisecond|#{num} milliseconds": "one#{num} милисекунда|few#{num} милисекунде|#{num} милисекунди",
+    "1#1 second|#{num} seconds": "one#{num} секунда|few#{num} секунде|#{num} секунди",
+    "1#1 minute|#{num} minutes": "one#{num} минут|few#{num} минута|#{num} минута",
+    "1#1 hour|#{num} hours": "one#{num} сат|few#{num} сата|#{num} сати",
+    "1#1 day|#{num} days": "one#{num} дан|few#{num} дана|#{num} дана",
+    "1#1 week|#{num} weeks": "one#{num} седмица|few#{num} седмице|#{num} седмица",
+    "1#1 month|#{num} months": "one#{num} мјесец|few#{num} мјесеца|#{num} мјесеци",
     "1#1 year|#{num} years": "one#{num} година|few#{num} године|#{num} година",
-    "#{num} ms": "#{num} ms",
-    "1#1 sec|#{num} sec": "one#{num} сек|few#{num} сек|#{num} сек",
-    "1#1 min|#{num} min": "one#{num} мин|few#{num} мин|#{num} мин",
-    "1#1 hr|#{num} hrs": "one#{num} сат|few#{num} сата|#{num} сат",
+    "#{num} ms": "one#{num} мс|few#{num} мс|#{num} мс",
+    "1#1 sec|#{num} sec": "one#{num} сек.|few#{num} сек.|#{num} сек.",
+    "1#1 min|#{num} min": "one#{num} мин.|few#{num} мин.|#{num} мин.",
+    "1#1 hr|#{num} hrs": "one#{num} сат|few#{num} сата|#{num} сати",
     "durationLongDays": "one#{num} дан|few#{num} дана|#{num} дан",
-    "1#1 wk|#{num} wks": "one#{num} нед|few#{num} нед|#{num} нед",
-    "1#1 mon|#{num} mons": "one#{num} мес|few#{num} мес|#{num} мес",
+    "1#1 wk|#{num} wks": "one#{num} сед.|few#{num} сед.|#{num} сед.",
+    "1#1 mon|#{num} mons": "one#{num} мјес.|few#{num} мјес.|#{num} мјес.",
     "1#1 yr|#{num} yrs": "one#{num} год|few#{num} год|#{num} год",
-    "durationMediumMillis": "#{num} ms",
-    "1#1 se|#{num} sec": "one#{num} сек|few#{num} сек|#{num} сек",
-    "1#1 mi|#{num} min": "one#{num} мин|few#{num} мин|#{num} мин",
-    "durationMediumHours": "one#{num} сат|few#{num} сата|#{num} сат",
+    "durationMediumMillis": "one#{num} мс|few#{num} мс|#{num} мс",
+    "1#1 se|#{num} sec": "one#{num} сек.|few#{num} сек.|#{num} сек.",
+    "1#1 mi|#{num} min": "one#{num} мин.|few#{num} мин.|#{num} мин.",
+    "durationMediumHours": "one#{num} сат|few#{num} сата|#{num} сати",
     "1#1 dy|#{num} dys": "one#{num} дан|few#{num} дана|#{num} дан",
-    "durationMediumWeeks": "one#{num} нед|few#{num} нед|#{num} нед",
-    "1#1 mo|#{num} mos": "one#{num} мес|few#{num} мес|#{num} мес",
+    "durationMediumWeeks": "one#{num} сед.|few#{num} сед.|#{num} сед.",
+    "1#1 mo|#{num} mos": "one#{num} мјес.|few#{num} мјес.|#{num} мјес.",
     "durationMediumYears": "one#{num} год|few#{num} год|#{num} год",
-    "durationShortMillis": "#{num} ms",
-    "#{num}s": "one#{num} сек|few#{num} сек|#{num} сек",
-    "durationShortMinutes": "one#{num} мин|few#{num} мин|#{num} мин",
-    "#{num}h": "one#{num} сат|few#{num} сата|#{num} сат",
+    "durationShortMillis": "one#{num} мс|few#{num} мс|#{num} мс",
+    "#{num}s": "one#{num} сек.|few#{num} сек.|#{num} сек.",
+    "durationShortMinutes": "one#{num} мин.|few#{num} мин.|#{num} мин.",
+    "#{num}h": "one#{num} сат|few#{num} сата|#{num} сати",
     "#{num}d": "one#{num} дан|few#{num} дана|#{num} дан",
-    "#{num}w": "one#{num} нед|few#{num} нед|#{num} нед",
-    "durationShortMonths": "one#{num} мес|few#{num} мес|#{num} мес",
+    "#{num}w": "one#{num} сед.|few#{num} сед.|#{num} сед.",
+    "durationShortMonths": "one#{num} мјес.|few#{num} мјес.|#{num} мјес.",
     "#{num}y": "one#{num} год|few#{num} год|#{num} год",
     "1#in 1 second|#in {num} seconds": "one#за {num} секунд|few#за {num} секунде|#за {num} секунди",
     "1#in 1 minute|#in {num} minutes": "one#за {num} минут|few#за {num} минута|#за {num} минута",
     "1#in 1 hour|#in {num} hours": "one#за {num} сат|few#за {num} сата|#за {num} сати",
     "1#in 1 day|#in {num} days": "one#за {num} дан|few#за {num} дана|#за {num} дана",
-    "1#in 1 week|#in {num} weeks": "one#за {num} недељу|few#за {num} недеље|#за {num} недеља",
-    "1#in 1 month|#in {num} months": "one#за {num} месец|few#за {num} месеца|#за {num} месеци",
+    "1#in 1 week|#in {num} weeks": "one#за {num} седмицу|few#за {num} седмице|#за {num} седмица",
+    "1#in 1 month|#in {num} months": "one#за {num} мјесец|few#за {num} мјесеца|#за {num} мјесеци",
     "1#in 1 year|#in {num} years": "one#за {num} годину|few#за {num} године|#за {num} година",
     "1#in 1 sec|#in {num} sec": "one#за {num} секунд|few#за {num} секунде|#за {num} секунди",
     "1#in 1 min|#in {num} min": "one#за {num} минут|few#за {num} минута|#за {num} минута",
     "1#in 1 hr|#in {num} hrs": "one#за {num} сат|few#за {num} сата|#за {num} сати",
     "1#in 1 dy|#in {num} dys": "one#за {num} дан|few#за {num} дана|#за {num} дана",
-    "1#in 1 wk|#in {num} wks": "one#за {num} недељу|few#за {num} недеље|#за {num} недеља",
-    "1#in 1 mon|#in {num} mons": "one#за {num} месец|few#за {num} месеца|#за {num} месеци",
+    "1#in 1 wk|#in {num} wks": "one#за {num} седмицу|few#за {num} седмице|#за {num} седмица",
+    "1#in 1 mon|#in {num} mons": "one#за {num} мјесец|few#за {num} мјесеца|#за {num} мјесеци",
     "1#in 1 yr|#in {num} yrs": "one#за {num} годину|few#за {num} године|#за {num} година",
-    "#in {num}s": "one#за {num} секунд|few#за {num} секунде|#за {num} секунди",
+    "#in {num}s": "one#за {num} сек.|few#за {num} секунде|#за {num} секунди",
     "#in {num}mi": "one#за {num} минут|few#за {num} минута|#за {num} минута",
     "#in {num}h": "one#за {num} сат|few#за {num} сата|#за {num} сати",
     "#in {num}d": "one#за {num} дан|few#за {num} дана|#за {num} дана",
-    "#in {num}w": "one#за {num} недељу|few#за {num} недеље|#за {num} недеља",
-    "#in {num}mo": "one#за {num} месец|few#за {num} месеца|#за {num} месеци",
+    "#in {num}w": "one#за {num} седм.|few#за {num} седм.|#за {num} седм.",
+    "#in {num}mo": "one#за {num} мјесец|few#за {num} мјесеца|#за {num} мјесеци",
     "#in {num}y": "one#за {num} годину|few#за {num} године|#за {num} година",
-    "1#1 second ago|#{num} seconds ago": "one#пре {num} секунд|few#пре {num} секунде|#пре {num} секунди",
-    "1#1 minute ago|#{num} minutes ago": "one#пре {num} минут|few#пре {num} минута|#пре {num} минута",
-    "1#1 hour ago|#{num} hours ago": "one#пре {num} сат|few#пре {num} сата|#пре {num} сати",
-    "1#1 day ago|#{num} days ago": "one#пре {num} дан|few#пре {num} дана|#пре {num} дана",
-    "1#1 week ago|#{num} weeks ago": "one#пре {num} недељу|few#пре {num} недеље|#пре {num} недеља",
-    "1#1 month ago|#{num} months ago": "one#пре {num} месец|few#пре {num} месеца|#пре {num} месеци",
-    "1#1 year ago|#{num} years ago": "one#пре {num} годину|few#пре {num} године|#пре {num} година",
-    "1#1 sec ago|#{num} sec ago": "one#пре {num} секунд|few#пре {num} секунде|#пре {num} секунди",
-    "1#1 min ago|#{num} min ago": "one#пре {num} минут|few#пре {num} минута|#пре {num} минута",
-    "1#1 hr ago|#{num} hrs ago": "one#пре {num} сат|few#пре {num} сата|#пре {num} сати",
-    "1#1 dy ago|#{num} dys ago": "one#пре {num} дан|few#пре {num} дана|#пре {num} дана",
-    "1#1 wk ago|#{num} wks ago": "one#пре {num} недељу|few#пре {num} недеље|#пре {num} недеља",
-    "1#1 mon ago|#{num} mons ago": "one#пре {num} месец|few#пре {num} месеца|#пре {num} месеци",
-    "1#1 yr ago|#{num} yrs ago": "one#пре {num} годину|few#пре {num} године|#пре {num} година",
-    "#{num}s ago": "one#пре {num} секунд|few#пре {num} секунде|#пре {num} секунди",
-    "#{num}mi ago": "one#пре {num} минут|few#пре {num} минута|#пре {num} минута",
-    "#{num}h ago": "one#пре {num} сат|few#пре {num} сата|#пре {num} сати",
-    "#{num}d ago": "one#пре {num} дан|few#пре {num} дана|#пре {num} дана",
-    "#{num}w ago": "one#пре {num} недељу|few#пре {num} недеље|#пре {num} недеља",
-    "#{num}mo ago": "one#пре {num} месец|few#пре {num} месеца|#пре {num} месеци",
-    "#{num}y ago": "one#пре {num} годину|few#пре {num} године|#пре {num} година",
+    "1#1 second ago|#{num} seconds ago": "one#прије {num} секунд|few#прије {num} секунде|#прије {num} секунди",
+    "1#1 minute ago|#{num} minutes ago": "one#прије {num} минут|few#прије {num} минута|#прије {num} минута",
+    "1#1 hour ago|#{num} hours ago": "one#прије {num} сат|few#прије {num} сата|#прије {num} сати",
+    "1#1 day ago|#{num} days ago": "one#прије {num} дан|few#прије {num} дана|#прије {num} дана",
+    "1#1 week ago|#{num} weeks ago": "one#прије {num} седмицу|few#прије {num} седмице|#прије {num} седмица",
+    "1#1 month ago|#{num} months ago": "one#прије {num} мјесец|few#прије {num} мјесеца|#прије {num} мјесеци",
+    "1#1 year ago|#{num} years ago": "one#прије {num} годину|few#прије {num} године|#прије {num} година",
+    "1#1 sec ago|#{num} sec ago": "one#прије {num} секунд|few#прије {num} секунде|#прије {num} секунди",
+    "1#1 min ago|#{num} min ago": "one#прије {num} минут|few#прије {num} минута|#прије {num} минута",
+    "1#1 hr ago|#{num} hrs ago": "one#прије {num} сат|few#прије {num} сата|#прије {num} сати",
+    "1#1 dy ago|#{num} dys ago": "one#прије {num} дан|few#прије {num} дана|#прије {num} дана",
+    "1#1 wk ago|#{num} wks ago": "one#прије {num} седмицу|few#прије {num} седмице|#прије {num} седмица",
+    "1#1 mon ago|#{num} mons ago": "one#прије {num} мјесец|few#прије {num} мјесеца|#прије {num} мјесеци",
+    "1#1 yr ago|#{num} yrs ago": "one#прије {num} годину|few#прије {num} године|#прије {num} година",
+    "#{num}s ago": "one#прије {num} сек.|few#прије {num} сек.|#прије {num} сек.",
+    "#{num}mi ago": "one#прије {num} минут|few#прије {num} минута|#прије {num} минута",
+    "#{num}h ago": "one#прије {num} сат|few#прије {num} сата|#прије {num} сати",
+    "#{num}d ago": "one#прије {num} дан|few#прије {num} дана|#прије {num} дана",
+    "#{num}w ago": "one#прије {num} седм.|few#прије {num} седм.|#прије {num} седм.",
+    "#{num}mo ago": "one#прије {num} мјесец|few#прије {num} мјесеца|#прије {num} мјесеци",
+    "#{num}y ago": "one#прије {num} годину|few#прије {num} године|#прије {num} година",
     "finalSeparatorFull": " и ",
     "finalSeparatorLong": " и ",
     "finalSeparatorMedium": " и ",
diff --git a/js/data/locale/ca/sysres.json b/js/data/locale/ca/sysres.json
index 491ffc6a61..558303d92e 100644
--- a/js/data/locale/ca/sysres.json
+++ b/js/data/locale/ca/sysres.json
@@ -151,8 +151,8 @@
     "ccc6": "ds.",
     "cc6": "ds.",
     "c6": "ds",
-    "a0": "a. m.",
-    "a1": "p. m.",
+    "a0": "a. m.",
+    "a1": "p. m.",
     "G-1": "AEC",
     "G1": "EC",
     "1#1 millisecond|#{num} milliseconds": "one#{num} mil·lisegon|#{num} mil·lisegons",
diff --git a/js/data/locale/ceb/dateformats.json b/js/data/locale/ceb/dateformats.json
new file mode 100644
index 0000000000..6a1589ef42
--- /dev/null
+++ b/js/data/locale/ceb/dateformats.json
@@ -0,0 +1,160 @@
+{
+    "gregorian": {
+        "order": {
+            "f": "{date} 'sa' {time}",
+            "l": "{date} 'sa' {time}",
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
+        },
+        "date": {
+            "dmwy": {
+                "f": "EEEE, MMMM d, yyyy",
+                "l": "EEE, MMMM d, yyyy",
+                "m": "EE, MMM d, yyyy",
+                "s": "E, M/d/yy"
+            },
+            "dmy": {
+                "f": "MMMM d, yyyy",
+                "l": "MMMM d, yyyy",
+                "m": "MMM d, yyyy",
+                "s": "M/d/yy"
+            },
+            "dmw": {
+                "f": "EEEE, MMMM d",
+                "l": "EEE, MMMM d",
+                "m": "EE, MMM d",
+                "s": "E, M/d"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "M/d"
+            },
+            "my": {
+                "f": "MMMM, yyyy",
+                "l": "MMMM, yyyy",
+                "m": "MMM, yyyy",
+                "s": "M/yy"
+            },
+            "dw": {
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, d"
+            },
+            "w": {
+                "f": "EEEE",
+                "l": "EEE",
+                "m": "EE",
+                "s": "E"
+            },
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "d"
+            },
+            "m": {
+                "f": "MMMM",
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "M"
+            },
+            "y": {
+                "f": "yyyy",
+                "l": "yyyy",
+                "m": "yyyy",
+                "s": "yy"
+            }
+        },
+        "time": {
+            "12": {
+                "h": "h",
+                "m": "mm",
+                "s": "ss",
+                "ah": "h a",
+                "hm": "h:mm",
+                "ms": "mm:ss",
+                "ahm": "h:mm a",
+                "hms": "h:mm:ss",
+                "hmz": "h:mm z",
+                "ahmz": "h:mm a z",
+                "ahms": "h:mm:ss a",
+                "hmsz": "h:mm:ss z",
+                "ahmsz": "h:mm:ss a z"
+            },
+            "24": {
+                "h": "HH",
+                "m": "mm",
+                "s": "ss",
+                "ah": "HH",
+                "hm": "HH:mm",
+                "ms": "mm:ss",
+                "ahm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmz": "HH:mm z",
+                "ahmz": "HH:mm z",
+                "ahms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "ahmsz": "HH:mm:ss z"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sm} {sd}, {sy} sa {st} – {et}",
+                "l": "{sm} {sd}, {sy} sa {st} – {et}",
+                "m": "{sm} {sd}, {sy}, {st} – {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {et}"
+            },
+            "c01": {
+                "f": "{sm} {sd}, {sy} sa {st} – {em} {ed}, {ey} sa {et}",
+                "l": "{sm} {sd}, {sy} sa {st} – {em} {ed}, {ey} sa {et}",
+                "m": "{sm} {sd}, {sy}, {st} – {em} {ed}, {ey}, {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {em}/{ed}/{ey}, {et}"
+            },
+            "c02": {
+                "f": "{sm} {sd}, {sy} sa {st} – {em} {ed}, {ey} sa {et}",
+                "l": "{sm} {sd}, {sy} sa {st} – {em} {ed}, {ey} sa {et}",
+                "m": "{sm} {sd}, {sy}, {st} – {em} {ed}, {ey}, {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {em}/{ed}/{ey}, {et}"
+            },
+            "c03": {
+                "f": "{sm} {sd}, {sy} sa {st} – {em} {ed}, {ey} sa {et}",
+                "l": "{sm} {sd}, {sy} sa {st} – {em} {ed}, {ey} sa {et}",
+                "m": "{sm} {sd}, {sy}, {st} – {em} {ed}, {ey}, {et}",
+                "s": "{sm}/{sd}/{sy}, {st} – {em}/{ed}/{ey}, {et}"
+            },
+            "c10": {
+                "f": "{sm} {sd} – {ed}, {ey}",
+                "l": "{sm} {sd} – {ed}, {ey}",
+                "m": "{sm} {sd} – {ed}, {ey}",
+                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+            },
+            "c11": {
+                "f": "{sm} {sd} – {em} {ed}, {ey}",
+                "l": "{sm} {sd} – {em} {ed}, {ey}",
+                "m": "{sm} {sd} – {em} {ed}, {ey}",
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
+            },
+            "c12": {
+                "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
+                "l": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
+                "m": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
+                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+            },
+            "c20": {
+                "f": "{sm}, {sy} – {em}, {ey}",
+                "l": "{sm}, {sy} – {em}, {ey}",
+                "m": "{sm}, {sy} – {em}, {ey}",
+                "s": "{sm}/{sy} – {em}/{ey}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ceb/sysres.json b/js/data/locale/ceb/sysres.json
new file mode 100644
index 0000000000..d1104e9336
--- /dev/null
+++ b/js/data/locale/ceb/sysres.json
@@ -0,0 +1,164 @@
+{
+    "MMMM1": "Enero",
+    "MMM1": "En",
+    "NN1": "En",
+    "N1": "E",
+    "MMMM2": "Pebrero",
+    "MMM2": "Peb",
+    "NN2": "Pe",
+    "N2": "P",
+    "MMMM3": "Marso",
+    "MMM3": "Mar",
+    "NN3": "Ma",
+    "N3": "M",
+    "MMMM4": "Abril",
+    "MMM4": "Apr",
+    "NN4": "Ap",
+    "N4": "A",
+    "MMMM5": "Mayo",
+    "MMM5": "May",
+    "NN5": "Ma",
+    "N5": "M",
+    "MMMM6": "Hunyo",
+    "MMM6": "Hun",
+    "NN6": "Hu",
+    "N6": "H",
+    "MMMM7": "Hulyo",
+    "MMM7": "Hul",
+    "NN7": "Hu",
+    "N7": "H",
+    "MMMM8": "Agosto",
+    "MMM8": "Ag",
+    "NN8": "Ag",
+    "N8": "A",
+    "MMMM9": "Setyembre",
+    "MMM9": "Set",
+    "NN9": "Se",
+    "N9": "S",
+    "MMMM10": "Oktubre",
+    "MMM10": "Okt",
+    "NN10": "Ok",
+    "N10": "O",
+    "MMMM11": "Nobyembre",
+    "MMM11": "Nob",
+    "NN11": "No",
+    "N11": "N",
+    "MMMM12": "Disyembre",
+    "MMM12": "Dis",
+    "NN12": "Di",
+    "N12": "D",
+    "EEEE0": "Domingo",
+    "EEE0": "Dom",
+    "EE0": "Dom",
+    "E0": "D",
+    "EEEE1": "Lunes",
+    "EEE1": "Lun",
+    "EE1": "Lun",
+    "E1": "L",
+    "EEEE2": "Martes",
+    "EEE2": "Mar",
+    "EE2": "Mar",
+    "E2": "M",
+    "EEEE3": "Miyerkules",
+    "EEE3": "Mks",
+    "EE3": "Miy",
+    "E3": "M",
+    "EEEE4": "Huwebes",
+    "EEE4": "Hu",
+    "EE4": "Huw",
+    "E4": "H",
+    "EEEE5": "Biyernes",
+    "EEE5": "Bi",
+    "EE5": "Biy",
+    "E5": "B",
+    "EEEE6": "Sabado",
+    "EEE6": "Sa",
+    "EE6": "Sab",
+    "E6": "S",
+    "a0": "AM",
+    "a1": "PM",
+    "G-1": "WKP",
+    "G1": "CE",
+    "1#1 millisecond|#{num} milliseconds": "one#{num} ka millisecond|#{num} ka mga millisecond",
+    "1#1 second|#{num} seconds": "one#{num} ka segundo|#{num} ka mga segundo",
+    "1#1 minute|#{num} minutes": "one#{num} ka minuto|#{num} ka mga minuto",
+    "1#1 hour|#{num} hours": "one#{num} ka oras|#{num} ka mga oras",
+    "1#1 day|#{num} days": "one#{num} ka adlaw|#{num} ka mga adlaw",
+    "1#1 week|#{num} weeks": "one#{num} ka semana|#{num} ka mga semana",
+    "1#1 month|#{num} months": "one#{num} ka buwan|#{num} ka mga buwan",
+    "1#1 year|#{num} years": "one#{num} ka tuig|#{num} ka mga tuig",
+    "#{num} ms": "#{num} ms",
+    "1#1 sec|#{num} sec": "one#{num} ka segundo|#{num} ka segundo",
+    "1#1 min|#{num} min": "one#{num} ka minuto|#{num} ka minuto",
+    "1#1 hr|#{num} hrs": "one#{num} ka oras|#{num} ka oras",
+    "durationLongDays": "one#{num} ka adlaw|#{num} ka adlaw",
+    "1#1 wk|#{num} wks": "one#{num} ka semana|#{num} ka semana",
+    "1#1 mon|#{num} mons": "one#{num} ka buwan|#{num} ka buwan",
+    "1#1 yr|#{num} yrs": "one#{num} ka tuig|#{num} ka tuig",
+    "durationMediumMillis": "one#{num}ms|#{num}ms",
+    "1#1 se|#{num} sec": "one#{num}segundo|#{num}segundo",
+    "1#1 mi|#{num} min": "one#{num} minuto|#{num}minuto",
+    "durationMediumHours": "one#{num} ka oras|#{num} ka oras",
+    "1#1 dy|#{num} dys": "one#{num} adlaw|#{num} adlaw",
+    "durationMediumWeeks": "one#{num} semana|#{num}w",
+    "1#1 mo|#{num} mos": "one#{num} buwan|#{num} buwan",
+    "durationMediumYears": "one#{num} ka tuig|#{num} ka tuig",
+    "durationShortMillis": "one#{num}ms|#{num}ms",
+    "#{num}s": "one#{num}segundo|#{num}segundo",
+    "durationShortMinutes": "one#{num} minuto|#{num}minuto",
+    "#{num}h": "one#{num} ka oras|#{num} ka oras",
+    "#{num}d": "one#{num} adlaw|#{num} adlaw",
+    "#{num}w": "one#{num} semana|#{num}w",
+    "durationShortMonths": "one#{num} buwan|#{num} buwan",
+    "#{num}y": "one#{num} ka tuig|#{num} ka tuig",
+    "1#in 1 second|#in {num} seconds": "#+{num} s",
+    "1#in 1 minute|#in {num} minutes": "#+{num} min",
+    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 day|#in {num} days": "#+{num} d",
+    "1#in 1 week|#in {num} weeks": "#+{num} w",
+    "1#in 1 month|#in {num} months": "#+{num} m",
+    "1#in 1 year|#in {num} years": "#+{num} y",
+    "1#in 1 sec|#in {num} sec": "#+{num} s",
+    "1#in 1 min|#in {num} min": "#+{num} min",
+    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 dy|#in {num} dys": "#+{num} d",
+    "1#in 1 wk|#in {num} wks": "#+{num} w",
+    "1#in 1 mon|#in {num} mons": "#+{num} m",
+    "1#in 1 yr|#in {num} yrs": "#+{num} y",
+    "#in {num}s": "#+{num} s",
+    "#in {num}mi": "#+{num} min",
+    "#in {num}h": "#+{num} h",
+    "#in {num}d": "#+{num} d",
+    "#in {num}w": "#+{num} w",
+    "#in {num}mo": "#+{num} m",
+    "#in {num}y": "#+{num} y",
+    "1#1 second ago|#{num} seconds ago": "#-{num} s",
+    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
+    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 day ago|#{num} days ago": "#-{num} d",
+    "1#1 week ago|#{num} weeks ago": "#-{num} w",
+    "1#1 month ago|#{num} months ago": "#-{num} m",
+    "1#1 year ago|#{num} years ago": "#-{num} y",
+    "1#1 sec ago|#{num} sec ago": "#-{num} s",
+    "1#1 min ago|#{num} min ago": "#-{num} min",
+    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 dy ago|#{num} dys ago": "#-{num} d",
+    "1#1 wk ago|#{num} wks ago": "#-{num} w",
+    "1#1 mon ago|#{num} mons ago": "#-{num} m",
+    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
+    "#{num}s ago": "#-{num} s",
+    "#{num}mi ago": "#-{num} min",
+    "#{num}h ago": "#-{num} h",
+    "#{num}d ago": "#-{num} d",
+    "#{num}w ago": "#-{num} w",
+    "#{num}mo ago": "#-{num} m",
+    "#{num}y ago": "#-{num} y",
+    "separatorFull": ", ",
+    "finalSeparatorFull": ", ",
+    "separatorLong": ", ",
+    "finalSeparatorLong": ", ",
+    "separatorMedium": ", ",
+    "finalSeparatorMedium": ", ",
+    "separatorShort": " ",
+    "finalSeparatorShort": " "
+}
\ No newline at end of file
diff --git a/js/data/locale/chr/dateformats.json b/js/data/locale/chr/dateformats.json
index edc39e1d48..1c32da2cca 100644
--- a/js/data/locale/chr/dateformats.json
+++ b/js/data/locale/chr/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/cs/sysres.json b/js/data/locale/cs/sysres.json
index f2cb514102..fd1d0025ca 100644
--- a/js/data/locale/cs/sysres.json
+++ b/js/data/locale/cs/sysres.json
@@ -153,8 +153,8 @@
     "c6": "S",
     "a0": "dop.",
     "a1": "odp.",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "př. n. l.",
+    "G1": "n. l.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisekunda|few#{num} milisekundy|many#{num} milisekundy|#{num} milisekund",
     "1#1 second|#{num} seconds": "one#{num} sekunda|few#{num} sekundy|many#{num} sekundy|#{num} sekund",
     "1#1 minute|#{num} minutes": "one#{num} minuta|few#{num} minuty|many#{num} minuty|#{num} minut",
diff --git a/js/data/locale/cy/sysres.json b/js/data/locale/cy/sysres.json
index 404ff7bffe..769cf8e63d 100644
--- a/js/data/locale/cy/sysres.json
+++ b/js/data/locale/cy/sysres.json
@@ -12,7 +12,7 @@
     "NN3": "Ma",
     "N3": "M",
     "MMMM4": "Ebrill",
-    "MMM4": "Ebrill",
+    "MMM4": "Ebr",
     "NN4": "Eb",
     "N4": "E",
     "MMMM5": "Mai",
diff --git a/js/data/locale/da/sysres.json b/js/data/locale/da/sysres.json
index 98198d5792..865b10a14f 100644
--- a/js/data/locale/da/sysres.json
+++ b/js/data/locale/da/sysres.json
@@ -90,14 +90,14 @@
     "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} sek.|#{num} sek.",
     "1#1 min|#{num} min": "one#{num} min.|#{num} min.",
-    "1#1 hr|#{num} hrs": "one#{num} t|#{num} t",
+    "1#1 hr|#{num} hrs": "one#{num} t.|#{num} t",
     "durationLongDays": "one#{num} dag|#{num} dage",
     "1#1 wk|#{num} wks": "one#{num} uge|#{num} uger",
     "1#1 mon|#{num} mons": "one#{num} md.|#{num} mdr.",
     "1#1 yr|#{num} yrs": "one#{num} år|#{num} år",
     "durationMediumMillis": "one#{num} ms|#{num} ms",
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} m|#{num} min",
+    "1#1 mi|#{num} min": "one#{num} m|#{num} m",
     "durationMediumHours": "one#{num} t|#{num} t",
     "1#1 dy|#{num} dys": "one#{num} d|#{num} d",
     "durationMediumWeeks": "one#{num} u|#{num} u",
@@ -105,7 +105,7 @@
     "durationMediumYears": "one#{num} år|#{num} år",
     "durationShortMillis": "one#{num} ms|#{num} ms",
     "#{num}s": "one#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} m|#{num} min",
+    "durationShortMinutes": "one#{num} m|#{num} m",
     "#{num}h": "one#{num} t|#{num} t",
     "#{num}d": "one#{num} d|#{num} d",
     "#{num}w": "one#{num} u|#{num} u",
diff --git a/js/data/locale/de/sysres.json b/js/data/locale/de/sysres.json
index 1260a92abd..078ae22c25 100644
--- a/js/data/locale/de/sysres.json
+++ b/js/data/locale/de/sysres.json
@@ -79,7 +79,6 @@
     "a1": "PM",
     "G-1": "v. u. Z.",
     "G1": "u. Z.",
-    "ordinalChoice": "#{num}.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} Millisekunde|#{num} Millisekunden",
     "1#1 second|#{num} seconds": "one#{num} Sekunde|#{num} Sekunden",
     "1#1 minute|#{num} minutes": "one#{num} Minute|#{num} Minuten",
@@ -88,7 +87,7 @@
     "1#1 week|#{num} weeks": "one#{num} Woche|#{num} Wochen",
     "1#1 month|#{num} months": "one#{num} Monat|#{num} Monate",
     "1#1 year|#{num} years": "one#{num} Jahr|#{num} Jahre",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} Sek.|#{num} Sek.",
     "1#1 min|#{num} min": "one#{num} Min.|#{num} Min.",
     "1#1 hr|#{num} hrs": "one#{num} Std.|#{num} Std.",
@@ -96,16 +95,16 @@
     "1#1 wk|#{num} wks": "one#{num} Wo.|#{num} Wo.",
     "1#1 mon|#{num} mons": "one#{num} Mon.|#{num} Mon.",
     "1#1 yr|#{num} yrs": "one#{num} J|#{num} J",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
+    "durationMediumMillis": "#{num} ms",
+    "1#1 se|#{num} sec": "one#{num} Sek.|#{num} Sek.",
     "1#1 mi|#{num} min": "one#{num} Min.|#{num} Min.",
     "durationMediumHours": "one#{num} Std.|#{num} Std.",
     "1#1 dy|#{num} dys": "one#{num} T|#{num} T",
     "durationMediumWeeks": "one#{num} W|#{num} W",
     "1#1 mo|#{num} mos": "one#{num} M|#{num} M",
     "durationMediumYears": "one#{num} J|#{num} J",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "#{num}s": "one#{num} s|#{num} s",
+    "durationShortMillis": "#{num} ms",
+    "#{num}s": "one#{num} Sek.|#{num} Sek.",
     "durationShortMinutes": "one#{num} Min.|#{num} Min.",
     "#{num}h": "one#{num} Std.|#{num} Std.",
     "#{num}d": "one#{num} T|#{num} T",
@@ -161,5 +160,6 @@
     "separatorMedium": ", ",
     "finalSeparatorMedium": " und ",
     "separatorShort": ", ",
-    "finalSeparatorShort": " und "
-}
+    "finalSeparatorShort": " und ",
+    "ordinalChoice": "#{num}."
+}
\ No newline at end of file
diff --git a/js/data/locale/ee/TG/dateformats.json b/js/data/locale/ee/TG/dateformats.json
index 0b94633fb8..72c2d7ce7e 100644
--- a/js/data/locale/ee/TG/dateformats.json
+++ b/js/data/locale/ee/TG/dateformats.json
@@ -121,15 +121,15 @@
                 "s": "{st} {sm}/{sd}/{sy} – {et} {em}/{ed}/{ey}"
             },
             "c10": {
-                "f": "{sm} {sd} – {ed} lia{ey}",
-                "l": "{sm} {sd} – {ed} lia{ey}",
-                "m": "{sm} {sd} – {ed} lia,{ey}",
+                "f": "{sm} {sd} – {ed} lia {ey}",
+                "l": "{sm} {sd} – {ed} lia {ey}",
+                "m": "{sm} {sd} – {ed} lia, {ey}",
                 "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
             },
             "c11": {
-                "f": "{sm} {sd} – {em} {ed} lia{ey}",
-                "l": "{sm} {sd} – {em} {ed} lia{ey}",
-                "m": "{sm} {sd} – {em} {ed} lia,{ey}",
+                "f": "{sm} {sd} – {em} {ed} lia {ey}",
+                "l": "{sm} {sd} – {em} {ed} lia {ey}",
+                "m": "{sm} {sd} – {em} {ed} lia, {ey}",
                 "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
diff --git a/js/data/locale/ee/dateformats.json b/js/data/locale/ee/dateformats.json
index e2f826d55f..970de19b78 100644
--- a/js/data/locale/ee/dateformats.json
+++ b/js/data/locale/ee/dateformats.json
@@ -121,15 +121,15 @@
                 "s": "{st} {sm}/{sd}/{sy} – {et} {em}/{ed}/{ey}"
             },
             "c10": {
-                "f": "{sm} {sd} – {ed} lia{ey}",
-                "l": "{sm} {sd} – {ed} lia{ey}",
-                "m": "{sm} {sd} – {ed} lia,{ey}",
+                "f": "{sm} {sd} – {ed} lia {ey}",
+                "l": "{sm} {sd} – {ed} lia {ey}",
+                "m": "{sm} {sd} – {ed} lia, {ey}",
                 "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
             },
             "c11": {
-                "f": "{sm} {sd} – {em} {ed} lia{ey}",
-                "l": "{sm} {sd} – {em} {ed} lia{ey}",
-                "m": "{sm} {sd} – {em} {ed} lia,{ey}",
+                "f": "{sm} {sd} – {em} {ed} lia {ey}",
+                "l": "{sm} {sd} – {em} {ed} lia {ey}",
+                "m": "{sm} {sd} – {em} {ed} lia, {ey}",
                 "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
diff --git a/js/data/locale/en/AE/dateformats.json b/js/data/locale/en/AE/dateformats.json
new file mode 100644
index 0000000000..7d7bf27226
--- /dev/null
+++ b/js/data/locale/en/AE/dateformats.json
@@ -0,0 +1,160 @@
+{
+    "gregorian": {
+        "order": {
+            "f": "{date} 'at' {time}",
+            "l": "{date} 'at' {time}",
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
+        },
+        "date": {
+            "dmwy": {
+                "f": "EEEE, d MMMM yyyy",
+                "l": "EEE, d MMMM yyyy",
+                "m": "EE, d MMM yyyy",
+                "s": "E, dd/MM/yyyy"
+            },
+            "dmy": {
+                "f": "d MMMM yyyy",
+                "l": "d MMMM yyyy",
+                "m": "d MMM yyyy",
+                "s": "dd/MM/yyyy"
+            },
+            "dmw": {
+                "f": "EEEE, d MMMM",
+                "l": "EEE, d MMMM",
+                "m": "EE, d MMM",
+                "s": "E, dd/MM"
+            },
+            "dm": {
+                "f": "d MMMM",
+                "l": "d MMMM",
+                "m": "d MMM",
+                "s": "dd/MM"
+            },
+            "my": {
+                "f": "MMMM yyyy",
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy",
+                "s": "MM/yyyy"
+            },
+            "dw": {
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, dd"
+            },
+            "w": {
+                "f": "EEEE",
+                "l": "EEE",
+                "m": "EE",
+                "s": "E"
+            },
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "m": {
+                "f": "MMMM",
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "y": {
+                "f": "yyyy",
+                "l": "yyyy",
+                "m": "yyyy",
+                "s": "yyyy"
+            }
+        },
+        "time": {
+            "12": {
+                "h": "h",
+                "m": "mm",
+                "s": "ss",
+                "ah": "h a",
+                "hm": "h:mm",
+                "ms": "mm:ss",
+                "ahm": "h:mm a",
+                "hms": "h:mm:ss",
+                "hmz": "h:mm z",
+                "ahmz": "h:mm a z",
+                "ahms": "h:mm:ss a",
+                "hmsz": "h:mm:ss z",
+                "ahmsz": "h:mm:ss a z"
+            },
+            "24": {
+                "h": "HH",
+                "m": "mm",
+                "s": "ss",
+                "ah": "HH",
+                "hm": "HH:mm",
+                "ms": "mm:ss",
+                "ahm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmz": "HH:mm z",
+                "ahmz": "HH:mm z",
+                "ahms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "ahmsz": "HH:mm:ss z"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sd} {sm} {sy} at {st} – {et}",
+                "l": "{sd} {sm} {sy} at {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
+            },
+            "c01": {
+                "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c02": {
+                "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c03": {
+                "f": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "l": "{sd} {sm} {sy} at {st} – {ed} {em} {ey} at {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+            },
+            "c10": {
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
+                "m": "{sd} – {ed} {em} {ey}",
+                "s": "{sd} – {ed}/{em}/{ey}"
+            },
+            "c11": {
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
+                "s": "{sd}/{sm} – {ed}/{em}/{ey}"
+            },
+            "c12": {
+                "f": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}"
+            },
+            "c20": {
+                "f": "{sm} {sy} – {em} {ey}",
+                "l": "{sm} {sy} – {em} {ey}",
+                "m": "{sm} {sy} – {em} {ey}",
+                "s": "{sm}/{sy} – {em}/{ey}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/en/AS/dateformats.json b/js/data/locale/en/AS/dateformats.json
index d5227b95fd..7dd60b44f3 100644
--- a/js/data/locale/en/AS/dateformats.json
+++ b/js/data/locale/en/AS/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/en/AU/sysres.json b/js/data/locale/en/AU/sysres.json
index 0fad66f0fa..29c3be6cb2 100644
--- a/js/data/locale/en/AU/sysres.json
+++ b/js/data/locale/en/AU/sysres.json
@@ -16,12 +16,10 @@
     "1#1 min|#{num} min": "one#{num} min.|#{num} min.",
     "1#1 hr|#{num} hrs": "one#{num} hr|#{num} hrs",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} m.",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "1#1 se|#{num} sec": "one#{num} s.|#{num} s.",
-    "1#1 mi|#{num} min": "one#{num} min.|#{num} min.",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "#{num}s": "one#{num} s.|#{num} s.",
-    "durationShortMinutes": "one#{num} min.|#{num} min.",
+    "1#1 se|#{num} sec": "one#{num}s.|#{num}s.",
+    "1#1 mi|#{num} min": "one#{num}min.|#{num}min.",
+    "#{num}s": "one#{num}s.|#{num}s.",
+    "durationShortMinutes": "one#{num}min.|#{num}min.",
     "#in {num}s": "one#in {num} sec.|#in {num} secs",
     "#in {num}mi": "one#in {num} min.|#in {num} mins",
     "#in {num}h": "one#in {num} hr|#in {num} hrs",
diff --git a/js/data/locale/en/BI/dateformats.json b/js/data/locale/en/BI/dateformats.json
index d5227b95fd..7dd60b44f3 100644
--- a/js/data/locale/en/BI/dateformats.json
+++ b/js/data/locale/en/BI/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/en/GU/dateformats.json b/js/data/locale/en/GU/dateformats.json
index d5227b95fd..7dd60b44f3 100644
--- a/js/data/locale/en/GU/dateformats.json
+++ b/js/data/locale/en/GU/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/en/MH/dateformats.json b/js/data/locale/en/MH/dateformats.json
index d5227b95fd..7dd60b44f3 100644
--- a/js/data/locale/en/MH/dateformats.json
+++ b/js/data/locale/en/MH/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/en/MP/dateformats.json b/js/data/locale/en/MP/dateformats.json
index d5227b95fd..7dd60b44f3 100644
--- a/js/data/locale/en/MP/dateformats.json
+++ b/js/data/locale/en/MP/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/en/UM/dateformats.json b/js/data/locale/en/UM/dateformats.json
index d5227b95fd..7dd60b44f3 100644
--- a/js/data/locale/en/UM/dateformats.json
+++ b/js/data/locale/en/UM/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/en/VI/dateformats.json b/js/data/locale/en/VI/dateformats.json
index d5227b95fd..7dd60b44f3 100644
--- a/js/data/locale/en/VI/dateformats.json
+++ b/js/data/locale/en/VI/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/es/419/dateformats.json b/js/data/locale/es/419/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/419/dateformats.json
+++ b/js/data/locale/es/419/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/419/sysres.json b/js/data/locale/es/419/sysres.json
index db251c36f0..4b0b58f679 100644
--- a/js/data/locale/es/419/sysres.json
+++ b/js/data/locale/es/419/sysres.json
@@ -13,10 +13,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/AR/dateformats.json b/js/data/locale/es/AR/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/AR/dateformats.json
+++ b/js/data/locale/es/AR/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/AR/sysres.json b/js/data/locale/es/AR/sysres.json
index 29e8eac007..330d4fa100 100644
--- a/js/data/locale/es/AR/sysres.json
+++ b/js/data/locale/es/AR/sysres.json
@@ -7,11 +7,15 @@
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} año|#{num} años",
     "1#1 se|#{num} sec": "one#{num}seg.|#{num}seg.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}a.",
     "#{num}s": "one#{num}seg.|#{num}seg.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/BO/dateformats.json b/js/data/locale/es/BO/dateformats.json
index 381caaad1d..102a21c360 100644
--- a/js/data/locale/es/BO/dateformats.json
+++ b/js/data/locale/es/BO/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} de {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/BO/sysres.json b/js/data/locale/es/BO/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/BO/sysres.json
+++ b/js/data/locale/es/BO/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/BR/dateformats.json b/js/data/locale/es/BR/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/BR/dateformats.json
+++ b/js/data/locale/es/BR/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/BR/sysres.json b/js/data/locale/es/BR/sysres.json
index db251c36f0..4b0b58f679 100644
--- a/js/data/locale/es/BR/sysres.json
+++ b/js/data/locale/es/BR/sysres.json
@@ -13,10 +13,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/BZ/dateformats.json b/js/data/locale/es/BZ/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/BZ/dateformats.json
+++ b/js/data/locale/es/BZ/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/BZ/sysres.json b/js/data/locale/es/BZ/sysres.json
index db251c36f0..4b0b58f679 100644
--- a/js/data/locale/es/BZ/sysres.json
+++ b/js/data/locale/es/BZ/sysres.json
@@ -13,10 +13,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/CL/dateformats.json b/js/data/locale/es/CL/dateformats.json
index 6971e8a2f9..93beef1eaa 100644
--- a/js/data/locale/es/CL/dateformats.json
+++ b/js/data/locale/es/CL/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
diff --git a/js/data/locale/es/CL/sysres.json b/js/data/locale/es/CL/sysres.json
index 7b5904c240..5ceda931df 100644
--- a/js/data/locale/es/CL/sysres.json
+++ b/js/data/locale/es/CL/sysres.json
@@ -18,10 +18,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/CO/dateformats.json b/js/data/locale/es/CO/dateformats.json
index c58f0589bc..59535fde4d 100644
--- a/js/data/locale/es/CO/dateformats.json
+++ b/js/data/locale/es/CO/dateformats.json
@@ -1,6 +1,11 @@
 {
     "gregorian": {
-        "order": "{date}, {time}",
+        "order": {
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
+        },
         "date": {
             "dmwy": {
                 "f": "EEEE, d 'de' MMMM 'de' yyyy",
@@ -97,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd}/{sm}/{sy}, {st} – {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}",
                 "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
diff --git a/js/data/locale/es/CO/sysres.json b/js/data/locale/es/CO/sysres.json
index 60580454a3..0da296ab3f 100644
--- a/js/data/locale/es/CO/sysres.json
+++ b/js/data/locale/es/CO/sysres.json
@@ -5,18 +5,10 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} mes|#{num} meses",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} a.",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
-    "durationMediumHours": "one#{num} h|#{num} h",
     "1#1 dy|#{num} dys": "one#{num} día|#{num} días",
     "durationMediumWeeks": "one#{num} sem.|#{num} sems.",
     "1#1 mo|#{num} mos": "one#{num} mes|#{num} meses",
     "durationMediumYears": "one#{num} a.|#{num} a.",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "#{num}s": "one#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} min|#{num} min",
-    "#{num}h": "one#{num} h|#{num} h",
     "#{num}d": "one#{num} día|#{num} días",
     "#{num}w": "one#{num} sem.|#{num} sems.",
     "durationShortMonths": "one#{num} mes|#{num} meses",
diff --git a/js/data/locale/es/CR/dateformats.json b/js/data/locale/es/CR/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/CR/dateformats.json
+++ b/js/data/locale/es/CR/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/CR/sysres.json b/js/data/locale/es/CR/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/CR/sysres.json
+++ b/js/data/locale/es/CR/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/CU/dateformats.json b/js/data/locale/es/CU/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/CU/dateformats.json
+++ b/js/data/locale/es/CU/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/CU/sysres.json b/js/data/locale/es/CU/sysres.json
index db251c36f0..4b0b58f679 100644
--- a/js/data/locale/es/CU/sysres.json
+++ b/js/data/locale/es/CU/sysres.json
@@ -13,10 +13,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/DO/dateformats.json b/js/data/locale/es/DO/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/DO/dateformats.json
+++ b/js/data/locale/es/DO/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/DO/sysres.json b/js/data/locale/es/DO/sysres.json
index 7239d2333d..e211334861 100644
--- a/js/data/locale/es/DO/sysres.json
+++ b/js/data/locale/es/DO/sysres.json
@@ -6,10 +6,16 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 se|#{num} sec": "one#{num} seg.|#{num} seg.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}d.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}m.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "#{num}s": "one#{num} seg.|#{num} seg.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}d.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}m.",
diff --git a/js/data/locale/es/EC/dateformats.json b/js/data/locale/es/EC/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/EC/dateformats.json
+++ b/js/data/locale/es/EC/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/EC/sysres.json b/js/data/locale/es/EC/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/EC/sysres.json
+++ b/js/data/locale/es/EC/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/GT/dateformats.json b/js/data/locale/es/GT/dateformats.json
index 3a6ed4f7ad..e1c592501a 100644
--- a/js/data/locale/es/GT/dateformats.json
+++ b/js/data/locale/es/GT/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd}/{sm}/{sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/GT/sysres.json b/js/data/locale/es/GT/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/GT/sysres.json
+++ b/js/data/locale/es/GT/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/HN/dateformats.json b/js/data/locale/es/HN/dateformats.json
index d0ebf173f5..e0699ba7f2 100644
--- a/js/data/locale/es/HN/dateformats.json
+++ b/js/data/locale/es/HN/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/HN/sysres.json b/js/data/locale/es/HN/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/HN/sysres.json
+++ b/js/data/locale/es/HN/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/MX/dateformats.json b/js/data/locale/es/MX/dateformats.json
index ead6f27231..d5cfe79c54 100644
--- a/js/data/locale/es/MX/dateformats.json
+++ b/js/data/locale/es/MX/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/MX/sysres.json b/js/data/locale/es/MX/sysres.json
index a881dd4adf..a7eb047dd4 100644
--- a/js/data/locale/es/MX/sysres.json
+++ b/js/data/locale/es/MX/sysres.json
@@ -1,27 +1,21 @@
 {
-    "MMM1": "ene",
-    "MMM2": "feb",
-    "MMM3": "mar",
-    "MMM4": "abr",
-    "MMM5": "may",
-    "MMM6": "jun",
-    "MMM7": "jul",
-    "MMM8": "ago",
-    "MMM9": "sep",
-    "MMM10": "oct",
-    "MMM11": "nov",
-    "MMM12": "dic",
-    "EE0": "do",
-    "EE1": "lu",
-    "EE2": "ma",
-    "EE3": "mi",
+    "MMM9": "sep.",
     "E3": "M",
-    "EE4": "ju",
-    "EE5": "vi",
-    "EE6": "sá",
     "durationLongDays": "one#{num} día|#{num} días",
     "1#1 wk|#{num} wks": "one#{num} sem|#{num} sem",
     "1#1 mon|#{num} mons": "one#{num} m|#{num} m",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
+    "1#1 dy|#{num} dys": "one#{num}d|#{num}d",
+    "durationMediumWeeks": "one#{num}sem|#{num}sem",
+    "1#1 mo|#{num} mos": "one#{num}m|#{num}m",
+    "durationMediumYears": "one#{num}a|#{num}a",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
+    "#{num}d": "one#{num}d|#{num}d",
+    "#{num}w": "one#{num}sem|#{num}sem",
+    "durationShortMonths": "one#{num}m|#{num}m",
+    "#{num}y": "one#{num}a|#{num}a",
     "1#in 1 month|#in {num} months": "one#en {num} mes|#en {num} meses",
     "1#in 1 mon|#in {num} mons": "one#en {num} mes|#en {num} meses",
     "#in {num}s": "one#en {num} s|#en {num} s",
diff --git a/js/data/locale/es/NI/dateformats.json b/js/data/locale/es/NI/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/NI/dateformats.json
+++ b/js/data/locale/es/NI/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/NI/sysres.json b/js/data/locale/es/NI/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/NI/sysres.json
+++ b/js/data/locale/es/NI/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/PA/dateformats.json b/js/data/locale/es/PA/dateformats.json
index 439e4efe61..c2d5c8fa8f 100644
--- a/js/data/locale/es/PA/dateformats.json
+++ b/js/data/locale/es/PA/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
@@ -157,4 +157,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/es/PA/sysres.json b/js/data/locale/es/PA/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/PA/sysres.json
+++ b/js/data/locale/es/PA/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/PE/dateformats.json b/js/data/locale/es/PE/dateformats.json
index dea874910c..c6c5c420de 100644
--- a/js/data/locale/es/PE/dateformats.json
+++ b/js/data/locale/es/PE/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -114,26 +114,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/PE/sysres.json b/js/data/locale/es/PE/sysres.json
index 9abc92c609..c5ba4ed6d6 100644
--- a/js/data/locale/es/PE/sysres.json
+++ b/js/data/locale/es/PE/sysres.json
@@ -88,10 +88,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/PR/dateformats.json b/js/data/locale/es/PR/dateformats.json
index 439e4efe61..c2d5c8fa8f 100644
--- a/js/data/locale/es/PR/dateformats.json
+++ b/js/data/locale/es/PR/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}",
                 "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
@@ -157,4 +157,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/es/PR/sysres.json b/js/data/locale/es/PR/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/PR/sysres.json
+++ b/js/data/locale/es/PR/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/PY/dateformats.json b/js/data/locale/es/PY/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/PY/dateformats.json
+++ b/js/data/locale/es/PY/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/PY/sysres.json b/js/data/locale/es/PY/sysres.json
index bce1ec99f8..450b875fbb 100644
--- a/js/data/locale/es/PY/sysres.json
+++ b/js/data/locale/es/PY/sysres.json
@@ -18,10 +18,16 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} mes|#{num} meses",
     "1#1 yr|#{num} yrs": "one#{num} año|#{num} años",
+    "1#1 se|#{num} sec": "one#{num} seg.|#{num} seg.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "#{num}s": "one#{num} seg.|#{num} seg.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/SV/dateformats.json b/js/data/locale/es/SV/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/SV/dateformats.json
+++ b/js/data/locale/es/SV/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/SV/sysres.json b/js/data/locale/es/SV/sysres.json
index 75a5a5c4c1..0bf3eeeacc 100644
--- a/js/data/locale/es/SV/sysres.json
+++ b/js/data/locale/es/SV/sysres.json
@@ -11,10 +11,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/US/dateformats.json b/js/data/locale/es/US/dateformats.json
index 4b91aec63b..2fb893f0e6 100644
--- a/js/data/locale/es/US/dateformats.json
+++ b/js/data/locale/es/US/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/US/sysres.json b/js/data/locale/es/US/sysres.json
index 2cd78b5eb9..04ab63160f 100644
--- a/js/data/locale/es/US/sysres.json
+++ b/js/data/locale/es/US/sysres.json
@@ -1,16 +1,19 @@
 {
     "MMM9": "sep.",
     "E3": "M",
-    "durationLongDays": "one#{num} d.|#{num} dd.",
-    "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
-    "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
-    "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
-    "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
-    "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
-    "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
-    "durationMediumYears": "one#{num}a.|#{num}aa.",
-    "#{num}d": "one#{num}d.|#{num}dd.",
-    "#{num}w": "one#{num}sem.|#{num}sems.",
-    "durationShortMonths": "one#{num}m.|#{num}mm.",
-    "#{num}y": "one#{num}a.|#{num}aa."
+    "durationLongDays": "one#{num} día|#{num} días",
+    "1#1 wk|#{num} wks": "one#{num} sem|#{num} sem",
+    "1#1 mon|#{num} mons": "one#{num} m|#{num} m",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
+    "1#1 dy|#{num} dys": "one#{num}d|#{num}d",
+    "durationMediumWeeks": "one#{num}sem|#{num}sem",
+    "1#1 mo|#{num} mos": "one#{num}m|#{num}m",
+    "durationMediumYears": "one#{num}a|#{num}a",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
+    "#{num}d": "one#{num}d|#{num}d",
+    "#{num}w": "one#{num}sem|#{num}sem",
+    "durationShortMonths": "one#{num}m|#{num}m",
+    "#{num}y": "one#{num}a|#{num}a"
 }
\ No newline at end of file
diff --git a/js/data/locale/es/UY/dateformats.json b/js/data/locale/es/UY/dateformats.json
index 5fe11db79a..b4c1dba280 100644
--- a/js/data/locale/es/UY/dateformats.json
+++ b/js/data/locale/es/UY/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -114,26 +114,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/UY/sysres.json b/js/data/locale/es/UY/sysres.json
index 9abc92c609..c5ba4ed6d6 100644
--- a/js/data/locale/es/UY/sysres.json
+++ b/js/data/locale/es/UY/sysres.json
@@ -88,10 +88,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/VE/dateformats.json b/js/data/locale/es/VE/dateformats.json
index a26d085242..6189cf2079 100644
--- a/js/data/locale/es/VE/dateformats.json
+++ b/js/data/locale/es/VE/dateformats.json
@@ -1,8 +1,8 @@
 {
     "gregorian": {
         "order": {
-            "f": "{date}, {time}",
-            "l": "{date}, {time}",
+            "f": "{date} 'a' 'las' {time}",
+            "l": "{date} 'a' 'las' {time}",
             "m": "{date} {time}",
             "s": "{date} {time}"
         },
@@ -102,26 +102,26 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} de {sm} de {sy}, {st} – {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
-                "l": "{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}",
+                "f": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
+                "l": "{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
diff --git a/js/data/locale/es/VE/sysres.json b/js/data/locale/es/VE/sysres.json
index 5e68b73c9f..b447428fa3 100644
--- a/js/data/locale/es/VE/sysres.json
+++ b/js/data/locale/es/VE/sysres.json
@@ -17,10 +17,14 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sems.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} mm.",
     "1#1 yr|#{num} yrs": "one#{num} a.|#{num} aa.",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
+    "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}d.|#{num}dd.",
     "durationMediumWeeks": "one#{num}sem.|#{num}sems.",
     "1#1 mo|#{num} mos": "one#{num}m.|#{num}mm.",
     "durationMediumYears": "one#{num}a.|#{num}aa.",
+    "durationShortMinutes": "one#{num}min|#{num}min",
+    "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}d.|#{num}dd.",
     "#{num}w": "one#{num}sem.|#{num}sems.",
     "durationShortMonths": "one#{num}m.|#{num}mm.",
diff --git a/js/data/locale/es/sysres.json b/js/data/locale/es/sysres.json
index dcbe8c1d52..6f354a7a7d 100644
--- a/js/data/locale/es/sysres.json
+++ b/js/data/locale/es/sysres.json
@@ -75,8 +75,8 @@
     "EEE6": "sáb.",
     "EE6": "SA",
     "E6": "S",
-    "a0": "a. m.",
-    "a1": "p. m.",
+    "a0": "a. m.",
+    "a1": "p. m.",
     "G-1": "a. e. c.",
     "G1": "e. c.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisegundo|#{num} milisegundos",
@@ -95,22 +95,22 @@
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sem.",
     "1#1 mon|#{num} mons": "one#{num} m.|#{num} m.",
     "1#1 yr|#{num} yrs": "one#{num} a|#{num} a",
-    "durationMediumMillis": "one#{num}ms|#{num}ms",
-    "1#1 se|#{num} sec": "one#{num}s|#{num}s",
-    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
-    "durationMediumHours": "one#{num}h|#{num}h",
-    "1#1 dy|#{num} dys": "one#{num}d|#{num}d",
-    "durationMediumWeeks": "one#{num}sem|#{num}sem",
-    "1#1 mo|#{num} mos": "one#{num}m|#{num}m",
-    "durationMediumYears": "one#{num}a|#{num}a",
-    "durationShortMillis": "one#{num}ms|#{num}ms",
-    "#{num}s": "one#{num}s|#{num}s",
-    "durationShortMinutes": "one#{num}min|#{num}min",
-    "#{num}h": "one#{num}h|#{num}h",
-    "#{num}d": "one#{num}d|#{num}d",
-    "#{num}w": "one#{num}sem|#{num}sem",
-    "durationShortMonths": "one#{num}m|#{num}m",
-    "#{num}y": "one#{num}a|#{num}a",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "1#1 dy|#{num} dys": "one#{num} d|#{num} d",
+    "durationMediumWeeks": "one#{num} sem.|#{num} sem.",
+    "1#1 mo|#{num} mos": "one#{num} m.|#{num} m.",
+    "durationMediumYears": "one#{num} a|#{num} a",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "#{num}s": "one#{num} s|#{num} s",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
+    "#{num}d": "one#{num} d|#{num} d",
+    "#{num}w": "one#{num} sem.|#{num} sem.",
+    "durationShortMonths": "one#{num} m.|#{num} m.",
+    "#{num}y": "one#{num} a|#{num} a",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
diff --git a/js/data/locale/eu/sysres.json b/js/data/locale/eu/sysres.json
index 10ce1dd94b..8538879239 100644
--- a/js/data/locale/eu/sysres.json
+++ b/js/data/locale/eu/sysres.json
@@ -99,18 +99,18 @@
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
     "1#1 mi|#{num} min": "one#{num} min|#{num} min",
     "durationMediumHours": "one#{num} h|#{num} h",
-    "1#1 dy|#{num} dys": "one#{num} egun|#{num} egun",
+    "1#1 dy|#{num} dys": "one#{num} e.|#{num} e.",
     "durationMediumWeeks": "one#{num} aste|#{num} aste",
-    "1#1 mo|#{num} mos": "one#{num} hil.|#{num} hil.",
-    "durationMediumYears": "one#{num} urte|#{num} urte",
+    "1#1 mo|#{num} mos": "one#{num} hil|#{num} hil",
+    "durationMediumYears": "one#{num} u.|#{num} u.",
     "durationShortMillis": "one#{num} ms|#{num} ms",
     "#{num}s": "one#{num} s|#{num} s",
     "durationShortMinutes": "one#{num} min|#{num} min",
     "#{num}h": "one#{num} h|#{num} h",
-    "#{num}d": "one#{num} egun|#{num} egun",
+    "#{num}d": "one#{num} e.|#{num} e.",
     "#{num}w": "one#{num} aste|#{num} aste",
-    "durationShortMonths": "one#{num} hil.|#{num} hil.",
-    "#{num}y": "one#{num} urte|#{num} urte",
+    "durationShortMonths": "one#{num} hil|#{num} hil",
+    "#{num}y": "one#{num} u.|#{num} u.",
     "1#in 1 second|#in {num} seconds": "one#{num} segundo barru|#{num} segundo barru",
     "1#in 1 minute|#in {num} minutes": "one#{num} minutu barru|#{num} minutu barru",
     "1#in 1 hour|#in {num} hours": "one#{num} ordu barru|#{num} ordu barru",
diff --git a/js/data/locale/fil/dateformats.json b/js/data/locale/fil/dateformats.json
index 53b37dd180..5b373eebf8 100644
--- a/js/data/locale/fil/dateformats.json
+++ b/js/data/locale/fil/dateformats.json
@@ -135,7 +135,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/fo/sysres.json b/js/data/locale/fo/sysres.json
index f504947d8a..fc5921d160 100644
--- a/js/data/locale/fo/sysres.json
+++ b/js/data/locale/fo/sysres.json
@@ -93,7 +93,7 @@
     "1#1 hr|#{num} hrs": "one#{num} t.|#{num} t.",
     "durationLongDays": "one#{num} d.|#{num} d.",
     "1#1 wk|#{num} wks": "one#{num} vi.|#{num} vi.",
-    "1#1 mon|#{num} mons": "one#{num} mán.|#{num} mán.",
+    "1#1 mon|#{num} mons": "one#{num} mnð.|#{num} mnð.",
     "1#1 yr|#{num} yrs": "one#{num} ár|#{num} ár",
     "durationMediumMillis": "one#{num}ms.|#{num}ms.",
     "1#1 se|#{num} sec": "one#{num}s.|#{num}s.",
diff --git a/js/data/locale/fr/CA/dateformats.json b/js/data/locale/fr/CA/dateformats.json
index 10f14bb92d..e6566ef906 100644
--- a/js/data/locale/fr/CA/dateformats.json
+++ b/js/data/locale/fr/CA/dateformats.json
@@ -11,13 +11,13 @@
                 "f": "EEEE d MMMM yyyy",
                 "l": "EEE d MMMM yyyy",
                 "m": "EE d MMM yyyy",
-                "s": "E yy-MM-dd"
+                "s": "E yyyy-MM-dd"
             },
             "dmy": {
                 "f": "d MMMM yyyy",
                 "l": "d MMMM yyyy",
                 "m": "d MMM yyyy",
-                "s": "yy-MM-dd"
+                "s": "yyyy-MM-dd"
             },
             "dmw": {
                 "f": "EEEE d MMMM",
@@ -35,7 +35,7 @@
                 "f": "MMMM yyyy",
                 "l": "MMMM yyyy",
                 "m": "MMM yyyy",
-                "s": "yy-MM"
+                "s": "yyyy-MM"
             },
             "dw": {
                 "f": "EEEE d",
@@ -65,7 +65,7 @@
                 "f": "yyyy",
                 "l": "yyyy",
                 "m": "yyyy",
-                "s": "yy"
+                "s": "yyyy"
             }
         },
         "time": {
@@ -90,7 +90,7 @@
                 "s": "ss",
                 "ah": "HH",
                 "hm": "HH 'h' mm",
-                "ms": "mm 'min' ss 's'",
+                "ms": "mm 'min' ss",
                 "ahm": "HH 'h' mm",
                 "hms": "HH 'h' mm 'min' ss 's'",
                 "hmz": "HH 'h' mm z",
@@ -157,4 +157,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/fr/CA/sysres.json b/js/data/locale/fr/CA/sysres.json
index 055fa58e40..54fb715235 100644
--- a/js/data/locale/fr/CA/sysres.json
+++ b/js/data/locale/fr/CA/sysres.json
@@ -2,17 +2,25 @@
     "MMM7": "juill.",
     "a0": "a.m.",
     "a1": "p.m.",
+    "1#1 millisecond|#{num} milliseconds": "one#{num} milliseconde|#{num} millisecondes",
+    "1#1 second|#{num} seconds": "one#{num} seconde|#{num} secondes",
+    "1#1 hour|#{num} hours": "one#{num} heure|#{num} heures",
+    "1#1 day|#{num} days": "one#{num} jour|#{num} jours",
+    "1#1 week|#{num} weeks": "one#{num} semaine|#{num} semaines",
+    "1#1 month|#{num} months": "one#{num} mois|#{num} mois",
     "1#1 year|#{num} years": "one#{num} an|#{num} ans",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationLongDays": "one#{num} j|#{num} j",
+    "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sem.",
+    "1#1 mon|#{num} mons": "one#{num} m.|#{num} m.",
     "1#1 yr|#{num} yrs": "one#{num} an|#{num} ans",
     "1#1 mi|#{num} min": "one#{num}m|#{num}m",
     "durationMediumWeeks": "one#{num}sem|#{num}sem",
     "1#1 mo|#{num} mos": "one#{num}m|#{num}m",
     "durationShortMinutes": "one#{num}m|#{num}m",
     "#{num}w": "one#{num}sem|#{num}sem",
-    "durationShortMonths": "one#{num}m|#{num}m",
-    "1#in 1 year|#in {num} years": "one#Dans {num} an|#Dans {num} ans",
-    "1#in 1 yr|#in {num} yrs": "one#Dans {num} an|#Dans {num} ans",
-    "1#1 year ago|#{num} years ago": "one#Il y a {num} an|#Il y a {num} ans",
-    "1#1 yr ago|#{num} yrs ago": "one#Il y a {num} an|#Il y a {num} ans"
+    "durationShortMonths": "one#{num}m|#{num}m"
 }
\ No newline at end of file
diff --git a/js/data/locale/fr/sysres.json b/js/data/locale/fr/sysres.json
index de65bebabb..abd0bdc92a 100644
--- a/js/data/locale/fr/sysres.json
+++ b/js/data/locale/fr/sysres.json
@@ -97,7 +97,7 @@
     "1#1 yr|#{num} yrs": "one#{num} an|#{num} ans",
     "durationMediumMillis": "one#{num}ms|#{num}ms",
     "1#1 se|#{num} sec": "one#{num}s|#{num}s",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 mi|#{num} min": "one#{num}min|#{num}min",
     "durationMediumHours": "one#{num}h|#{num}h",
     "1#1 dy|#{num} dys": "one#{num}j|#{num}j",
     "durationMediumWeeks": "one#{num}sem.|#{num}sem.",
@@ -105,7 +105,7 @@
     "durationMediumYears": "one#{num}a|#{num}a",
     "durationShortMillis": "one#{num}ms|#{num}ms",
     "#{num}s": "one#{num}s|#{num}s",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMinutes": "one#{num}min|#{num}min",
     "#{num}h": "one#{num}h|#{num}h",
     "#{num}d": "one#{num}j|#{num}j",
     "#{num}w": "one#{num}sem.|#{num}sem.",
diff --git a/js/data/locale/ga/GB/dateformats.json b/js/data/locale/ga/GB/dateformats.json
new file mode 100644
index 0000000000..54049ac543
--- /dev/null
+++ b/js/data/locale/ga/GB/dateformats.json
@@ -0,0 +1,155 @@
+{
+    "gregorian": {
+        "order": "{date} {time}",
+        "date": {
+            "dmwy": {
+                "f": "EEEE d MMMM yyyy",
+                "l": "EEE d MMMM yyyy",
+                "m": "EE d MMM yyyy",
+                "s": "E dd/MM/yyyy"
+            },
+            "dmy": {
+                "f": "d MMMM yyyy",
+                "l": "d MMMM yyyy",
+                "m": "d MMM yyyy",
+                "s": "dd/MM/yyyy"
+            },
+            "dmw": {
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E dd/MM"
+            },
+            "dm": {
+                "f": "d MMMM",
+                "l": "d MMMM",
+                "m": "d MMM",
+                "s": "dd/MM"
+            },
+            "my": {
+                "f": "MMMM yyyy",
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy",
+                "s": "MM/yyyy"
+            },
+            "dw": {
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E dd"
+            },
+            "w": {
+                "f": "EEEE",
+                "l": "EEE",
+                "m": "EE",
+                "s": "E"
+            },
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "dd"
+            },
+            "m": {
+                "f": "MMMM",
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "MM"
+            },
+            "y": {
+                "f": "yyyy",
+                "l": "yyyy",
+                "m": "yyyy",
+                "s": "yyyy"
+            }
+        },
+        "time": {
+            "12": {
+                "h": "h",
+                "m": "mm",
+                "s": "ss",
+                "ah": "h a",
+                "hm": "h:mm",
+                "ms": "mm:ss",
+                "ahm": "h:mm a",
+                "hms": "h:mm:ss",
+                "hmz": "h:mm z",
+                "ahmz": "h:mm a z",
+                "ahms": "h:mm:ss a",
+                "hmsz": "h:mm:ss z",
+                "ahmsz": "h:mm:ss a z"
+            },
+            "24": {
+                "h": "HH",
+                "m": "mm",
+                "s": "ss",
+                "ah": "HH",
+                "hm": "HH:mm",
+                "ms": "mm:ss",
+                "ahm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmz": "HH:mm z",
+                "ahmz": "HH:mm z",
+                "ahms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "ahmsz": "HH:mm:ss z"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "{sd} {sm} {sy} {st} – {et}",
+                "l": "{sd} {sm} {sy} {st} – {et}",
+                "m": "{sd} {sm} {sy} {st} – {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {et}"
+            },
+            "c01": {
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+            },
+            "c02": {
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+            },
+            "c03": {
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+            },
+            "c10": {
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
+                "m": "{sd} – {ed} {em} {ey}",
+                "s": "{sd} – {ed}/{em}/{ey}"
+            },
+            "c11": {
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
+                "s": "{sd}/{sm} – {ed}/{em}/{ey}"
+            },
+            "c12": {
+                "f": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}"
+            },
+            "c20": {
+                "f": "{sm} {sy} – {em} {ey}",
+                "l": "{sm} {sy} – {em} {ey}",
+                "m": "{sm} {sy} – {em} {ey}",
+                "s": "{sm}/{sy} – {em}/{ey}"
+            },
+            "c30": {
+                "f": "{sy} – {ey}",
+                "l": "{sy} – {ey}",
+                "m": "{sy} – {ey}",
+                "s": "{sy} – {ey}"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/gd/sysres.json b/js/data/locale/gd/sysres.json
index a8a090feae..2a88d1d85f 100644
--- a/js/data/locale/gd/sysres.json
+++ b/js/data/locale/gd/sysres.json
@@ -155,7 +155,7 @@
     "a1": "f",
     "G-1": "BCE",
     "G1": "CE",
-    "1#1 millisecond|#{num} milliseconds": "one#{num} mhille-dhiog|two#{num} mhille-dhiog|few#{num} mille-dhiogan|#{num} mille-dhiog",
+    "1#1 millisecond|#{num} milliseconds": "one#{num} mhili-diog|two#{num} mhili-diog|few#{num} mili-diogan|#{num} mili-diog",
     "1#1 second|#{num} seconds": "one#{num} diog|two#{num} dhiog|few#{num} diogan|#{num} diog",
     "1#1 minute|#{num} minutes": "one#{num} mhionaid|two#{num} mhionaid|few#{num} mionaidean|#{num} mionaid",
     "1#1 hour|#{num} hours": "one#{num} uair a thìde|two#{num} uair a thìde|few#{num} uairean a thìde|#{num} uair a thìde",
diff --git a/js/data/locale/gl/sysres.json b/js/data/locale/gl/sysres.json
index 92977b8a8a..ab2fbea101 100644
--- a/js/data/locale/gl/sysres.json
+++ b/js/data/locale/gl/sysres.json
@@ -167,7 +167,7 @@
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
     "1#1 min|#{num} min": "one#{num} min|#{num} min",
     "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
-    "durationLongDays": "one#{num} d|#{num} d",
+    "durationLongDays": "one#{num} día|#{num} días",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sem.",
     "1#1 mon|#{num} mons": "one#{num} mes|#{num} meses",
     "1#1 yr|#{num} yrs": "one#{num} ano|#{num} anos",
diff --git a/js/data/locale/gu/dateformats.json b/js/data/locale/gu/dateformats.json
index 347f662501..d5a9016605 100644
--- a/js/data/locale/gu/dateformats.json
+++ b/js/data/locale/gu/dateformats.json
@@ -157,4 +157,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/ha/GH/dateformats.json b/js/data/locale/ha/GH/dateformats.json
index 1ccdc4ccfe..2cc65e3fe3 100644
--- a/js/data/locale/ha/GH/dateformats.json
+++ b/js/data/locale/ha/GH/dateformats.json
@@ -3,10 +3,10 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "EEEE, d MMMM, yyyy",
-                "l": "EEE, d MMMM, yyyy",
-                "m": "EE, d MMM, yyyy",
-                "s": "E, d/M/yy"
+                "f": "EEEE d MMMM, yyyy",
+                "l": "EEE d MMMM, yyyy",
+                "m": "EE d MMM, yyyy",
+                "s": "E d/M/yy"
             },
             "dmy": {
                 "f": "d MMMM, yyyy",
@@ -15,10 +15,10 @@
                 "s": "d/M/yy"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, d MMM",
-                "s": "E, d/M"
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E d/M"
             },
             "dm": {
                 "f": "d MMMM",
@@ -33,10 +33,10 @@
                 "s": "M/yy"
             },
             "dw": {
-                "f": "EEEE, d",
-                "l": "EEE, d",
-                "m": "EE, d",
-                "s": "E, d"
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E d"
             },
             "w": {
                 "f": "EEEE",
diff --git a/js/data/locale/ha/NE/dateformats.json b/js/data/locale/ha/NE/dateformats.json
index 1ccdc4ccfe..2cc65e3fe3 100644
--- a/js/data/locale/ha/NE/dateformats.json
+++ b/js/data/locale/ha/NE/dateformats.json
@@ -3,10 +3,10 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "EEEE, d MMMM, yyyy",
-                "l": "EEE, d MMMM, yyyy",
-                "m": "EE, d MMM, yyyy",
-                "s": "E, d/M/yy"
+                "f": "EEEE d MMMM, yyyy",
+                "l": "EEE d MMMM, yyyy",
+                "m": "EE d MMM, yyyy",
+                "s": "E d/M/yy"
             },
             "dmy": {
                 "f": "d MMMM, yyyy",
@@ -15,10 +15,10 @@
                 "s": "d/M/yy"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, d MMM",
-                "s": "E, d/M"
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E d/M"
             },
             "dm": {
                 "f": "d MMMM",
@@ -33,10 +33,10 @@
                 "s": "M/yy"
             },
             "dw": {
-                "f": "EEEE, d",
-                "l": "EEE, d",
-                "m": "EE, d",
-                "s": "E, d"
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E d"
             },
             "w": {
                 "f": "EEEE",
diff --git a/js/data/locale/ha/dateformats.json b/js/data/locale/ha/dateformats.json
index 1ccdc4ccfe..2cc65e3fe3 100644
--- a/js/data/locale/ha/dateformats.json
+++ b/js/data/locale/ha/dateformats.json
@@ -3,10 +3,10 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "EEEE, d MMMM, yyyy",
-                "l": "EEE, d MMMM, yyyy",
-                "m": "EE, d MMM, yyyy",
-                "s": "E, d/M/yy"
+                "f": "EEEE d MMMM, yyyy",
+                "l": "EEE d MMMM, yyyy",
+                "m": "EE d MMM, yyyy",
+                "s": "E d/M/yy"
             },
             "dmy": {
                 "f": "d MMMM, yyyy",
@@ -15,10 +15,10 @@
                 "s": "d/M/yy"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, d MMM",
-                "s": "E, d/M"
+                "f": "EEEE d MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E d/M"
             },
             "dm": {
                 "f": "d MMMM",
@@ -33,10 +33,10 @@
                 "s": "M/yy"
             },
             "dw": {
-                "f": "EEEE, d",
-                "l": "EEE, d",
-                "m": "EE, d",
-                "s": "E, d"
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E d"
             },
             "w": {
                 "f": "EEEE",
diff --git a/js/data/locale/ha/sysres.json b/js/data/locale/ha/sysres.json
index a46e6b83d7..41af779c8f 100644
--- a/js/data/locale/ha/sysres.json
+++ b/js/data/locale/ha/sysres.json
@@ -75,10 +75,10 @@
     "EEE6": "Asa",
     "EE6": "As",
     "E6": "A",
-    "a0": "AM",
-    "a1": "PM",
-    "G-1": "BCE",
-    "G1": "CE",
+    "a0": "Safiya",
+    "a1": "Yamma",
+    "G-1": "K.H.Y",
+    "G1": "B.H.Y",
     "1#1 millisecond|#{num} milliseconds": "#{num} ms",
     "1#1 second|#{num} seconds": "#{num} s",
     "1#1 minute|#{num} minutes": "#{num} min",
@@ -111,44 +111,44 @@
     "#{num}w": "#{num} w",
     "durationShortMonths": "#{num} m",
     "#{num}y": "#{num} y",
-    "1#in 1 second|#in {num} seconds": "#+{num} s",
-    "1#in 1 minute|#in {num} minutes": "#+{num} min",
-    "1#in 1 hour|#in {num} hours": "#+{num} h",
+    "1#in 1 second|#in {num} seconds": "one#cikin {num} dakika|#cikin {num} dakika",
+    "1#in 1 minute|#in {num} minutes": "one#cikin {num} minti|#cikin {num} minti",
+    "1#in 1 hour|#in {num} hours": "one#cikin {num} awa|#cikin {num} awa",
     "1#in 1 day|#in {num} days": "#+{num} d",
     "1#in 1 week|#in {num} weeks": "#+{num} w",
     "1#in 1 month|#in {num} months": "#+{num} m",
     "1#in 1 year|#in {num} years": "#+{num} y",
-    "1#in 1 sec|#in {num} sec": "#+{num} s",
-    "1#in 1 min|#in {num} min": "#+{num} min",
-    "1#in 1 hr|#in {num} hrs": "#+{num} h",
+    "1#in 1 sec|#in {num} sec": "one#cikin {num} dakika|#cikin {num} dakika",
+    "1#in 1 min|#in {num} min": "one#cikin {num} minti|#cikin {num} minti",
+    "1#in 1 hr|#in {num} hrs": "one#cikin {num} awa|#cikin {num} awa",
     "1#in 1 dy|#in {num} dys": "#+{num} d",
     "1#in 1 wk|#in {num} wks": "#+{num} w",
     "1#in 1 mon|#in {num} mons": "#+{num} m",
     "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "#in {num}s": "#+{num} s",
-    "#in {num}mi": "#+{num} min",
-    "#in {num}h": "#+{num} h",
+    "#in {num}s": "one#cikin {num} dakika|#cikin {num} dakika",
+    "#in {num}mi": "one#cikin {num} minti|#cikin {num} minti",
+    "#in {num}h": "one#cikin {num} awa|#cikin {num} awa",
     "#in {num}d": "#+{num} d",
     "#in {num}w": "#+{num} w",
     "#in {num}mo": "#+{num} m",
     "#in {num}y": "#+{num} y",
-    "1#1 second ago|#{num} seconds ago": "#-{num} s",
-    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
-    "1#1 hour ago|#{num} hours ago": "#-{num} h",
+    "1#1 second ago|#{num} seconds ago": "one#{num} dakika da ya gabata|#{num} dakika da ya gabata",
+    "1#1 minute ago|#{num} minutes ago": "one#{num} minti da ya gabata|#{num} minti da ya gabata",
+    "1#1 hour ago|#{num} hours ago": "one#{num} awa da ya gabata|#{num} awa da ya gabata",
     "1#1 day ago|#{num} days ago": "#-{num} d",
     "1#1 week ago|#{num} weeks ago": "#-{num} w",
     "1#1 month ago|#{num} months ago": "#-{num} m",
     "1#1 year ago|#{num} years ago": "#-{num} y",
-    "1#1 sec ago|#{num} sec ago": "#-{num} s",
-    "1#1 min ago|#{num} min ago": "#-{num} min",
-    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
+    "1#1 sec ago|#{num} sec ago": "one#{num} dakika da ya gabata|#{num} dakika da ya gabata",
+    "1#1 min ago|#{num} min ago": "one#{num} minti da ya gabata|#{num} minti da ya gabata",
+    "1#1 hr ago|#{num} hrs ago": "one#{num} awa da ya gabata|#{num} awa da ya gabata",
     "1#1 dy ago|#{num} dys ago": "#-{num} d",
     "1#1 wk ago|#{num} wks ago": "#-{num} w",
     "1#1 mon ago|#{num} mons ago": "#-{num} m",
     "1#1 yr ago|#{num} yrs ago": "#-{num} y",
-    "#{num}s ago": "#-{num} s",
-    "#{num}mi ago": "#-{num} min",
-    "#{num}h ago": "#-{num} h",
+    "#{num}s ago": "one#{num} dakika da ya gabata|#{num} dakika da ya gabata",
+    "#{num}mi ago": "one#{num} minti da ya gabata|#{num} minti da ya gabata",
+    "#{num}h ago": "one#{num} awa da ya gabata|#{num} awa da ya gabata",
     "#{num}d ago": "#-{num} d",
     "#{num}w ago": "#-{num} w",
     "#{num}mo ago": "#-{num} m",
diff --git a/js/data/locale/hi/sysres.json b/js/data/locale/hi/sysres.json
index 635f65f30c..0a17d4924a 100644
--- a/js/data/locale/hi/sysres.json
+++ b/js/data/locale/hi/sysres.json
@@ -75,8 +75,8 @@
     "EEE6": "शनि",
     "EE6": "श",
     "E6": "श",
-    "a0": "पूर्वाह्न",
-    "a1": "अपराह्न",
+    "a0": "am",
+    "a1": "pm",
     "G-1": "ईसवी पूर्व",
     "G1": "ईसवी",
     "1#1 millisecond|#{num} milliseconds": "one#{num} मिलीसेकंड|#{num} मिलीसेकंड",
@@ -160,5 +160,5 @@
     "separatorMedium": ", ",
     "finalSeparatorMedium": ", ",
     "separatorShort": ", ",
-    "finalSeparatorShort": ", "
+    "finalSeparatorShort": " "
 }
\ No newline at end of file
diff --git a/js/data/locale/hr/sysres.json b/js/data/locale/hr/sysres.json
index a29cb5a951..7b62bc5518 100644
--- a/js/data/locale/hr/sysres.json
+++ b/js/data/locale/hr/sysres.json
@@ -232,9 +232,9 @@
     "separatorFull": ", ",
     "finalSeparatorFull": " i ",
     "separatorLong": ", ",
-    "finalSeparatorLong": ", ",
+    "finalSeparatorLong": " i ",
     "separatorMedium": ", ",
-    "finalSeparatorMedium": ", ",
+    "finalSeparatorMedium": " i ",
     "separatorShort": " ",
     "finalSeparatorShort": " "
 }
\ No newline at end of file
diff --git a/js/data/locale/ia/sysres.json b/js/data/locale/ia/sysres.json
index 428154f5be..4f0b750958 100644
--- a/js/data/locale/ia/sysres.json
+++ b/js/data/locale/ia/sysres.json
@@ -79,80 +79,80 @@
     "a1": "PM",
     "G-1": "aEC",
     "G1": "EC",
-    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 second|#{num} seconds": "#{num} s",
-    "1#1 minute|#{num} minutes": "#{num} min",
-    "1#1 hour|#{num} hours": "#{num} h",
-    "1#1 day|#{num} days": "#{num} d",
-    "1#1 week|#{num} weeks": "#{num} w",
-    "1#1 month|#{num} months": "#{num} m",
-    "1#1 year|#{num} years": "#{num} y",
-    "#{num} ms": "#{num} ms",
-    "1#1 sec|#{num} sec": "#{num} s",
-    "1#1 min|#{num} min": "#{num} min",
-    "1#1 hr|#{num} hrs": "#{num} h",
-    "durationLongDays": "#{num} d",
-    "1#1 wk|#{num} wks": "#{num} w",
-    "1#1 mon|#{num} mons": "#{num} m",
-    "1#1 yr|#{num} yrs": "#{num} y",
-    "durationMediumMillis": "#{num} ms",
-    "1#1 se|#{num} sec": "#{num} s",
-    "1#1 mi|#{num} min": "#{num} min",
-    "durationMediumHours": "#{num} h",
-    "1#1 dy|#{num} dys": "#{num} d",
-    "durationMediumWeeks": "#{num} w",
-    "1#1 mo|#{num} mos": "#{num} m",
-    "durationMediumYears": "#{num} y",
-    "durationShortMillis": "#{num} ms",
-    "#{num}s": "#{num} s",
-    "durationShortMinutes": "#{num} min",
-    "#{num}h": "#{num} h",
-    "#{num}d": "#{num} d",
-    "#{num}w": "#{num} w",
-    "durationShortMonths": "#{num} m",
-    "#{num}y": "#{num} y",
-    "1#in 1 second|#in {num} seconds": "#+{num} s",
-    "1#in 1 minute|#in {num} minutes": "#+{num} min",
-    "1#in 1 hour|#in {num} hours": "#+{num} h",
-    "1#in 1 day|#in {num} days": "#+{num} d",
-    "1#in 1 week|#in {num} weeks": "#+{num} w",
-    "1#in 1 month|#in {num} months": "#+{num} m",
-    "1#in 1 year|#in {num} years": "#+{num} y",
-    "1#in 1 sec|#in {num} sec": "#+{num} s",
-    "1#in 1 min|#in {num} min": "#+{num} min",
-    "1#in 1 hr|#in {num} hrs": "#+{num} h",
-    "1#in 1 dy|#in {num} dys": "#+{num} d",
-    "1#in 1 wk|#in {num} wks": "#+{num} w",
-    "1#in 1 mon|#in {num} mons": "#+{num} m",
-    "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "#in {num}s": "#+{num} s",
-    "#in {num}mi": "#+{num} min",
-    "#in {num}h": "#+{num} h",
-    "#in {num}d": "#+{num} d",
-    "#in {num}w": "#+{num} w",
-    "#in {num}mo": "#+{num} m",
-    "#in {num}y": "#+{num} y",
-    "1#1 second ago|#{num} seconds ago": "#-{num} s",
-    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
-    "1#1 hour ago|#{num} hours ago": "#-{num} h",
-    "1#1 day ago|#{num} days ago": "#-{num} d",
-    "1#1 week ago|#{num} weeks ago": "#-{num} w",
-    "1#1 month ago|#{num} months ago": "#-{num} m",
-    "1#1 year ago|#{num} years ago": "#-{num} y",
-    "1#1 sec ago|#{num} sec ago": "#-{num} s",
-    "1#1 min ago|#{num} min ago": "#-{num} min",
-    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
-    "1#1 dy ago|#{num} dys ago": "#-{num} d",
-    "1#1 wk ago|#{num} wks ago": "#-{num} w",
-    "1#1 mon ago|#{num} mons ago": "#-{num} m",
-    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
-    "#{num}s ago": "#-{num} s",
-    "#{num}mi ago": "#-{num} min",
-    "#{num}h ago": "#-{num} h",
-    "#{num}d ago": "#-{num} d",
-    "#{num}w ago": "#-{num} w",
-    "#{num}mo ago": "#-{num} m",
-    "#{num}y ago": "#-{num} y",
+    "1#1 millisecond|#{num} milliseconds": "one#{num} ms|#{num} millisecundas",
+    "1#1 second|#{num} seconds": "one#{num} sec|#{num} secundas",
+    "1#1 minute|#{num} minutes": "one#{num} min|#{num} minutas",
+    "1#1 hour|#{num} hours": "one#{num} hr|#{num} horas",
+    "1#1 day|#{num} days": "one#{num} dies|#{num} dies",
+    "1#1 week|#{num} weeks": "one#{num} sept|#{num} septimanas",
+    "1#1 month|#{num} months": "one#{num} menses|#{num} menses",
+    "1#1 year|#{num} years": "one#{num} an|#{num} annos",
+    "#{num} ms": "one#{num} ms|#{num} ms",
+    "1#1 sec|#{num} sec": "one#{num} sec|#{num} sec",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} hr|#{num} hr",
+    "durationLongDays": "one#{num} dies|#{num} dies",
+    "1#1 wk|#{num} wks": "one#{num} sept|#{num} sept",
+    "1#1 mon|#{num} mons": "one#{num} menses|#{num} menses",
+    "1#1 yr|#{num} yrs": "one#{num} an|#{num} an",
+    "durationMediumMillis": "one#{num} ms|#{num}ms",
+    "1#1 se|#{num} sec": "one#{num} sec|#{num}s",
+    "1#1 mi|#{num} min": "one#{num} min|#{num}m",
+    "durationMediumHours": "one#{num} hr|#{num}h",
+    "1#1 dy|#{num} dys": "one#{num} dies|#{num}d",
+    "durationMediumWeeks": "one#{num} sept|#{num}sept",
+    "1#1 mo|#{num} mos": "one#{num} menses|#{num}m",
+    "durationMediumYears": "one#{num} an|#{num}an",
+    "durationShortMillis": "one#{num} ms|#{num}ms",
+    "#{num}s": "one#{num} sec|#{num}s",
+    "durationShortMinutes": "one#{num} min|#{num}m",
+    "#{num}h": "one#{num} hr|#{num}h",
+    "#{num}d": "one#{num} dies|#{num}d",
+    "#{num}w": "one#{num} sept|#{num}sept",
+    "durationShortMonths": "one#{num} menses|#{num}m",
+    "#{num}y": "one#{num} an|#{num}an",
+    "1#in 1 second|#in {num} seconds": "one#in {num} secundas|#in {num} secundas",
+    "1#in 1 minute|#in {num} minutes": "one#in {num} minutas|#in {num} minutas",
+    "1#in 1 hour|#in {num} hours": "one#in {num} horas|#in {num} horas",
+    "1#in 1 day|#in {num} days": "one#in {num} dies|#in {num} dies",
+    "1#in 1 week|#in {num} weeks": "one#in {num} septimanas|#in {num} septimanas",
+    "1#in 1 month|#in {num} months": "one#in {num} menses|#in {num} menses",
+    "1#in 1 year|#in {num} years": "one#in {num} annos|#in {num} annos",
+    "1#in 1 sec|#in {num} sec": "one#in {num} secundas|#in {num} secundas",
+    "1#in 1 min|#in {num} min": "one#in {num} minutas|#in {num} minutas",
+    "1#in 1 hr|#in {num} hrs": "one#in {num} horas|#in {num} horas",
+    "1#in 1 dy|#in {num} dys": "one#in {num} dies|#in {num} dies",
+    "1#in 1 wk|#in {num} wks": "one#in {num} septimanas|#in {num} septimanas",
+    "1#in 1 mon|#in {num} mons": "one#in {num} menses|#in {num} menses",
+    "1#in 1 yr|#in {num} yrs": "one#in {num} annos|#in {num} annos",
+    "#in {num}s": "one#in {num} secundas|#in {num} sec.",
+    "#in {num}mi": "one#in {num} minutas|#in {num} min.",
+    "#in {num}h": "one#in {num} horas|#in {num} hr.",
+    "#in {num}d": "one#in {num} dies|#in {num} dies",
+    "#in {num}w": "one#in {num} septimanas|#in {num} sept.",
+    "#in {num}mo": "one#in {num} menses|#in {num} mns.",
+    "#in {num}y": "one#in {num} annos|#in {num} an.",
+    "1#1 second ago|#{num} seconds ago": "one#{num} secundas retro|#{num} secundas retro",
+    "1#1 minute ago|#{num} minutes ago": "one#{num} minutas retro|#{num} minutas retro",
+    "1#1 hour ago|#{num} hours ago": "one#{num} horas retro|#{num} horas retro",
+    "1#1 day ago|#{num} days ago": "one#{num} dies retro|#{num} dies retro",
+    "1#1 week ago|#{num} weeks ago": "one#{num} septimanas retro|#{num} septimanas retro",
+    "1#1 month ago|#{num} months ago": "one#{num} menses retro|#{num} menses retro",
+    "1#1 year ago|#{num} years ago": "one#{num} annos retro|#{num} annos retro",
+    "1#1 sec ago|#{num} sec ago": "one#{num} secundas retro|#{num} secundas retro",
+    "1#1 min ago|#{num} min ago": "one#{num} minutas retro|#{num} minutas retro",
+    "1#1 hr ago|#{num} hrs ago": "one#{num} horas retro|#{num} horas retro",
+    "1#1 dy ago|#{num} dys ago": "one#{num} dies retro|#{num} dies retro",
+    "1#1 wk ago|#{num} wks ago": "one#{num} septimanas retro|#{num} septimanas retro",
+    "1#1 mon ago|#{num} mons ago": "one#{num} menses retro|#{num} menses retro",
+    "1#1 yr ago|#{num} yrs ago": "one#{num} annos retro|#{num} annos retro",
+    "#{num}s ago": "one#{num} secundas retro|#{num} sec. retro",
+    "#{num}mi ago": "one#{num} minutas retro|#{num} min. retro",
+    "#{num}h ago": "one#{num} horas retro|#{num} hr. retro",
+    "#{num}d ago": "one#{num} dies retro|#{num} dies retro",
+    "#{num}w ago": "one#{num} septimanas retro|#{num} sept. retro",
+    "#{num}mo ago": "one#{num} menses retro|#{num} mns. retro",
+    "#{num}y ago": "one#{num} annos retro|#{num} an. retro",
     "separatorFull": ", ",
     "finalSeparatorFull": ", ",
     "separatorLong": ", ",
diff --git a/js/data/locale/ig/dateformats.json b/js/data/locale/ig/dateformats.json
index 16933f813f..1f04562a5b 100644
--- a/js/data/locale/ig/dateformats.json
+++ b/js/data/locale/ig/dateformats.json
@@ -1,42 +1,47 @@
 {
     "gregorian": {
-        "order": "{date} {time}",
+        "order": {
+            "f": "{date} 'na' {time}",
+            "l": "{date} 'na' {time}",
+            "m": "{date}, {time}",
+            "s": "{date}, {time}"
+        },
         "date": {
             "dmwy": {
                 "f": "EEEE, d MMMM yyyy",
                 "l": "EEE, d MMMM yyyy",
                 "m": "EE, d MMM yyyy",
-                "s": "E, dd/MM/yyyy"
+                "s": "E, d/M/yy"
             },
             "dmy": {
                 "f": "d MMMM yyyy",
                 "l": "d MMMM yyyy",
                 "m": "d MMM yyyy",
-                "s": "dd/MM/yyyy"
+                "s": "d/M/yy"
             },
             "dmw": {
                 "f": "EEEE, d MMMM",
                 "l": "EEE, d MMMM",
                 "m": "EE, d MMM",
-                "s": "E, dd/MM"
+                "s": "E, d/M"
             },
             "dm": {
                 "f": "d MMMM",
                 "l": "d MMMM",
                 "m": "d MMM",
-                "s": "dd/MM"
+                "s": "d/M"
             },
             "my": {
                 "f": "MMMM yyyy",
                 "l": "MMMM yyyy",
                 "m": "MMM yyyy",
-                "s": "MM/yyyy"
+                "s": "M/yy"
             },
             "dw": {
                 "f": "EEEE, d",
                 "l": "EEE, d",
                 "m": "EE, d",
-                "s": "E, dd"
+                "s": "E, d"
             },
             "w": {
                 "f": "EEEE",
@@ -48,19 +53,19 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "dd"
+                "s": "d"
             },
             "m": {
                 "f": "MMMM",
                 "l": "MMMM",
                 "m": "MMM",
-                "s": "MM"
+                "s": "M"
             },
             "y": {
                 "f": "yyyy",
                 "l": "yyyy",
                 "m": "yyyy",
-                "s": "yyyy"
+                "s": "yy"
             }
         },
         "time": {
@@ -97,28 +102,28 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} {sm} {sy} {st} – {et}",
-                "l": "{sd} {sm} {sy} {st} – {et}",
-                "m": "{sd} {sm} {sy} {st} – {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {et}"
+                "f": "{sd} {sm} {sy} na {st} – {et}",
+                "l": "{sd} {sm} {sy} na {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
             },
             "c01": {
-                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "f": "{sd} {sm} {sy} na {st} – {ed} {em} {ey} na {et}",
+                "l": "{sd} {sm} {sy} na {st} – {ed} {em} {ey} na {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c02": {
-                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "f": "{sd} {sm} {sy} na {st} – {ed} {em} {ey} na {et}",
+                "l": "{sd} {sm} {sy} na {st} – {ed} {em} {ey} na {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c03": {
-                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "f": "{sd} {sm} {sy} na {st} – {ed} {em} {ey} na {et}",
+                "l": "{sd} {sm} {sy} na {st} – {ed} {em} {ey} na {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} {em} {ey}",
diff --git a/js/data/locale/ig/sysres.json b/js/data/locale/ig/sysres.json
index 54d2a5bcbf..cc56e04bf1 100644
--- a/js/data/locale/ig/sysres.json
+++ b/js/data/locale/ig/sysres.json
@@ -11,7 +11,7 @@
     "MMM3": "Maa",
     "NN3": "Ma",
     "N3": "M",
-    "MMMM4": "Eprel",
+    "MMMM4": "Epreel",
     "MMM4": "Epr",
     "NN4": "Ep",
     "N4": "E",
@@ -47,9 +47,9 @@
     "MMM12": "Dis",
     "NN12": "Di",
     "N12": "D",
-    "EEEE0": "Mbọsị Ụka",
+    "EEEE0": "Sọndee",
     "EEE0": "Ụka",
-    "EE0": "Ụka",
+    "EE0": "Sọn",
     "E0": "S",
     "EEEE1": "Mọnde",
     "EEE1": "Mọn",
@@ -75,8 +75,8 @@
     "EEE6": "Sat",
     "EE6": "Sat",
     "E6": "S",
-    "a0": "A.M.",
-    "a1": "P.M.",
+    "a0": "N’ụtụtụ",
+    "a1": "N’abali",
     "G-1": "BCE",
     "G1": "CE",
     "1#1 millisecond|#{num} milliseconds": "#{num} ms",
@@ -154,11 +154,11 @@
     "#{num}mo ago": "#-{num} m",
     "#{num}y ago": "#-{num} y",
     "separatorFull": ", ",
-    "finalSeparatorFull": ", ",
+    "finalSeparatorFull": ", na ",
     "separatorLong": ", ",
-    "finalSeparatorLong": ", ",
+    "finalSeparatorLong": ", na ",
     "separatorMedium": ", ",
-    "finalSeparatorMedium": ", ",
+    "finalSeparatorMedium": ", na ",
     "separatorShort": ", ",
-    "finalSeparatorShort": ", "
+    "finalSeparatorShort": ", na "
 }
\ No newline at end of file
diff --git a/js/data/locale/it/sysres.json b/js/data/locale/it/sysres.json
index 842b07cf36..f8d881b93b 100644
--- a/js/data/locale/it/sysres.json
+++ b/js/data/locale/it/sysres.json
@@ -77,8 +77,8 @@
     "E6": "S",
     "a0": "AM",
     "a1": "PM",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "a.E.V.",
+    "G1": "E.V.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} millisecondo|#{num} millisecondi",
     "1#1 second|#{num} seconds": "one#{num} secondo|#{num} secondi",
     "1#1 minute|#{num} minutes": "one#{num} minuto|#{num} minuti",
diff --git a/js/data/locale/ja/sysres.json b/js/data/locale/ja/sysres.json
index df671bc8b4..cf8f5c5ba0 100644
--- a/js/data/locale/ja/sysres.json
+++ b/js/data/locale/ja/sysres.json
@@ -77,8 +77,8 @@
     "E6": "土",
     "a0": "午前",
     "a1": "午後",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "西暦紀元前",
+    "G1": "西暦紀元",
     "1#1 millisecond|#{num} milliseconds": "#{num} ミリ秒",
     "1#1 second|#{num} seconds": "#{num} 秒",
     "1#1 minute|#{num} minutes": "#{num} 分",
diff --git a/js/data/locale/jv/sysres.json b/js/data/locale/jv/sysres.json
index 1342e3f4ad..1b9b03f8c9 100644
--- a/js/data/locale/jv/sysres.json
+++ b/js/data/locale/jv/sysres.json
@@ -48,8 +48,8 @@
     "NN12": "De",
     "N12": "D",
     "EEEE0": "Ahad",
-    "EEE0": "Ahd",
-    "EE0": "Ahd",
+    "EEE0": "Ahad",
+    "EE0": "Ahad",
     "E0": "A",
     "EEEE1": "Senin",
     "EEE1": "Sen",
@@ -83,76 +83,76 @@
     "1#1 second|#{num} seconds": "#{num} detik",
     "1#1 minute|#{num} minutes": "#{num} menit",
     "1#1 hour|#{num} hours": "#{num} jam",
-    "1#1 day|#{num} days": "#{num} dino",
-    "1#1 week|#{num} weeks": "#{num} pekan",
+    "1#1 day|#{num} days": "#{num} dina",
+    "1#1 week|#{num} weeks": "#{num} peken",
     "1#1 month|#{num} months": "#{num} sasi",
     "1#1 year|#{num} years": "#{num} taun",
     "#{num} ms": "#{num} md",
     "1#1 sec|#{num} sec": "#{num} dtk",
     "1#1 min|#{num} min": "#{num} mnt",
     "1#1 hr|#{num} hrs": "#{num} jam",
-    "durationLongDays": "#{num} dino",
-    "1#1 wk|#{num} wks": "#{num} pekan",
+    "durationLongDays": "#{num} dina",
+    "1#1 wk|#{num} wks": "#{num} peken",
     "1#1 mon|#{num} mons": "#{num} sasi",
     "1#1 yr|#{num} yrs": "#{num} taun",
     "durationMediumMillis": "#{num} md",
     "1#1 se|#{num} sec": "#{num} dtk",
     "1#1 mi|#{num} min": "#{num} mnt",
     "durationMediumHours": "#{num}j",
-    "1#1 dy|#{num} dys": "#{num} dino",
-    "durationMediumWeeks": "#{num} pekan",
+    "1#1 dy|#{num} dys": "#{num}d",
+    "durationMediumWeeks": "#{num} peken",
     "1#1 mo|#{num} mos": "#{num} sasi",
     "durationMediumYears": "#{num} taun",
     "durationShortMillis": "#{num} md",
     "#{num}s": "#{num} dtk",
     "durationShortMinutes": "#{num} mnt",
     "#{num}h": "#{num}j",
-    "#{num}d": "#{num} dino",
-    "#{num}w": "#{num} pekan",
+    "#{num}d": "#{num}d",
+    "#{num}w": "#{num} peken",
     "durationShortMonths": "#{num} sasi",
     "#{num}y": "#{num} taun",
-    "1#in 1 second|#in {num} seconds": "#+{num} s",
-    "1#in 1 minute|#in {num} minutes": "#+{num} min",
-    "1#in 1 hour|#in {num} hours": "#+{num} h",
-    "1#in 1 day|#in {num} days": "#+{num} d",
-    "1#in 1 week|#in {num} weeks": "#+{num} w",
-    "1#in 1 month|#in {num} months": "#+{num} m",
-    "1#in 1 year|#in {num} years": "#+{num} y",
-    "1#in 1 sec|#in {num} sec": "#+{num} s",
-    "1#in 1 min|#in {num} min": "#+{num} min",
-    "1#in 1 hr|#in {num} hrs": "#+{num} h",
-    "1#in 1 dy|#in {num} dys": "#+{num} d",
-    "1#in 1 wk|#in {num} wks": "#+{num} w",
-    "1#in 1 mon|#in {num} mons": "#+{num} m",
-    "1#in 1 yr|#in {num} yrs": "#+{num} y",
-    "#in {num}s": "#+{num} s",
-    "#in {num}mi": "#+{num} min",
-    "#in {num}h": "#+{num} h",
-    "#in {num}d": "#+{num} d",
-    "#in {num}w": "#+{num} w",
-    "#in {num}mo": "#+{num} m",
-    "#in {num}y": "#+{num} y",
-    "1#1 second ago|#{num} seconds ago": "#-{num} s",
-    "1#1 minute ago|#{num} minutes ago": "#-{num} min",
-    "1#1 hour ago|#{num} hours ago": "#-{num} h",
-    "1#1 day ago|#{num} days ago": "#-{num} d",
-    "1#1 week ago|#{num} weeks ago": "#-{num} w",
-    "1#1 month ago|#{num} months ago": "#-{num} m",
-    "1#1 year ago|#{num} years ago": "#-{num} y",
-    "1#1 sec ago|#{num} sec ago": "#-{num} s",
-    "1#1 min ago|#{num} min ago": "#-{num} min",
-    "1#1 hr ago|#{num} hrs ago": "#-{num} h",
-    "1#1 dy ago|#{num} dys ago": "#-{num} d",
-    "1#1 wk ago|#{num} wks ago": "#-{num} w",
-    "1#1 mon ago|#{num} mons ago": "#-{num} m",
-    "1#1 yr ago|#{num} yrs ago": "#-{num} y",
-    "#{num}s ago": "#-{num} s",
-    "#{num}mi ago": "#-{num} min",
-    "#{num}h ago": "#-{num} h",
-    "#{num}d ago": "#-{num} d",
-    "#{num}w ago": "#-{num} w",
-    "#{num}mo ago": "#-{num} m",
-    "#{num}y ago": "#-{num} y",
+    "1#in 1 second|#in {num} seconds": "#ing {num} detik",
+    "1#in 1 minute|#in {num} minutes": "#ing {num} menit",
+    "1#in 1 hour|#in {num} hours": "#ing {num} jam",
+    "1#in 1 day|#in {num} days": "#ing {num} dina",
+    "1#in 1 week|#in {num} weeks": "#ing {num} pekan",
+    "1#in 1 month|#in {num} months": "#ing {num} sasi",
+    "1#in 1 year|#in {num} years": "#ing {num} taun",
+    "1#in 1 sec|#in {num} sec": "#ing {num} detik",
+    "1#in 1 min|#in {num} min": "#ing {num} menit",
+    "1#in 1 hr|#in {num} hrs": "#ing {num} jam",
+    "1#in 1 dy|#in {num} dys": "#ing {num} dina",
+    "1#in 1 wk|#in {num} wks": "#ing {num} pekan",
+    "1#in 1 mon|#in {num} mons": "#ing {num} sasi",
+    "1#in 1 yr|#in {num} yrs": "#ing {num} taun",
+    "#in {num}s": "#ing {num} detik",
+    "#in {num}mi": "#ing {num} menit",
+    "#in {num}h": "#ing {num} jam",
+    "#in {num}d": "#ing {num} dina",
+    "#in {num}w": "#ing {num} pekan",
+    "#in {num}mo": "#ing {num} sasi",
+    "#in {num}y": "#ing {num} taun",
+    "1#1 second ago|#{num} seconds ago": "#{num} detik kepungkur",
+    "1#1 minute ago|#{num} minutes ago": "#{num} menit kepungkur",
+    "1#1 hour ago|#{num} hours ago": "#{num} jam kepungkur",
+    "1#1 day ago|#{num} days ago": "#{num} dina kepungkur",
+    "1#1 week ago|#{num} weeks ago": "#{num} pekan kepungkur",
+    "1#1 month ago|#{num} months ago": "#{num} sasi kepungkur",
+    "1#1 year ago|#{num} years ago": "#{num} taun kepungkur",
+    "1#1 sec ago|#{num} sec ago": "#{num} detik kepungkur",
+    "1#1 min ago|#{num} min ago": "#{num} menit kepungkur",
+    "1#1 hr ago|#{num} hrs ago": "#{num} jam kepungkur",
+    "1#1 dy ago|#{num} dys ago": "#{num} dina kepungkur",
+    "1#1 wk ago|#{num} wks ago": "#{num} pekan kepungkur",
+    "1#1 mon ago|#{num} mons ago": "#{num} sasi kepungkur",
+    "1#1 yr ago|#{num} yrs ago": "#{num} taun kepungkur",
+    "#{num}s ago": "#{num} detik kepungkur",
+    "#{num}mi ago": "#{num} menit kepungkur",
+    "#{num}h ago": "#{num} jam kepungkur",
+    "#{num}d ago": "#{num} dina kepungkur",
+    "#{num}w ago": "#{num} pekan kepungkur",
+    "#{num}mo ago": "#{num} sasi kepungkur",
+    "#{num}y ago": "#{num} taun kepungkur",
     "separatorFull": ", ",
     "finalSeparatorFull": ", ",
     "separatorLong": ", ",
diff --git a/js/data/locale/kea/dateformats.json b/js/data/locale/kea/dateformats.json
index 2aa06123e6..27e103c78c 100644
--- a/js/data/locale/kea/dateformats.json
+++ b/js/data/locale/kea/dateformats.json
@@ -1,42 +1,42 @@
 {
     "gregorian": {
-        "order": "{date} {time}",
+        "order": "{date}, {time}",
         "date": {
             "dmwy": {
                 "f": "EEEE, d 'di' MMMM 'di' yyyy",
                 "l": "EEE, d 'di' MMMM 'di' yyyy",
                 "m": "EE, d MMM yyyy",
-                "s": "E, d/M/yyyy"
+                "s": "E, dd/MM/yyyy"
             },
             "dmy": {
                 "f": "d 'di' MMMM 'di' yyyy",
                 "l": "d 'di' MMMM 'di' yyyy",
                 "m": "d MMM yyyy",
-                "s": "d/M/yyyy"
+                "s": "dd/MM/yyyy"
             },
             "dmw": {
                 "f": "EEEE, d 'di' MMMM",
                 "l": "EEE, d 'di' MMMM",
                 "m": "EE, d MMM",
-                "s": "E, d/M"
+                "s": "E, dd/MM"
             },
             "dm": {
                 "f": "d 'di' MMMM",
                 "l": "d 'di' MMMM",
                 "m": "d MMM",
-                "s": "d/M"
+                "s": "dd/MM"
             },
             "my": {
                 "f": "MMMM 'di' yyyy",
                 "l": "MMMM 'di' yyyy",
                 "m": "MMM yyyy",
-                "s": "M/yyyy"
+                "s": "MM/yyyy"
             },
             "dw": {
                 "f": "EEEE, d",
                 "l": "EEE, d",
                 "m": "EE, d",
-                "s": "E, d"
+                "s": "E, dd"
             },
             "w": {
                 "f": "EEEE",
@@ -48,13 +48,13 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "d"
+                "s": "dd"
             },
             "m": {
                 "f": "MMMM",
                 "l": "MMMM",
                 "m": "MMM",
-                "s": "M"
+                "s": "MM"
             },
             "y": {
                 "f": "yyyy",
@@ -97,28 +97,28 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} di {sm} di {sy} {st} – {et}",
-                "l": "{sd} di {sm} di {sy} {st} – {et}",
-                "m": "{sd} {sm} {sy} {st} – {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {et}"
+                "f": "{sd} di {sm} di {sy}, {st} – {et}",
+                "l": "{sd} di {sm} di {sy}, {st} – {et}",
+                "m": "{sd} {sm} {sy}, {st} – {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {et}"
             },
             "c01": {
-                "f": "{sd} di {sm} di {sy} {st} – {ed} di {em} di {ey} {et}",
-                "l": "{sd} di {sm} di {sy} {st} – {ed} di {em} di {ey} {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "f": "{sd} di {sm} di {sy}, {st} – {ed} di {em} di {ey}, {et}",
+                "l": "{sd} di {sm} di {sy}, {st} – {ed} di {em} di {ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c02": {
-                "f": "{sd} di {sm} di {sy} {st} – {ed} di {em} di {ey} {et}",
-                "l": "{sd} di {sm} di {sy} {st} – {ed} di {em} di {ey} {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "f": "{sd} di {sm} di {sy}, {st} – {ed} di {em} di {ey}, {et}",
+                "l": "{sd} di {sm} di {sy}, {st} – {ed} di {em} di {ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c03": {
-                "f": "{sd} di {sm} di {sy} {st} – {ed} di {em} di {ey} {et}",
-                "l": "{sd} di {sm} di {sy} {st} – {ed} di {em} di {ey} {et}",
-                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
+                "f": "{sd} di {sm} di {sy}, {st} – {ed} di {em} di {ey}, {et}",
+                "l": "{sd} di {sm} di {sy}, {st} – {ed} di {em} di {ey}, {et}",
+                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
+                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} di {em} di {ey}",
diff --git a/js/data/locale/kl/dateformats.json b/js/data/locale/kl/dateformats.json
index 295443c17d..2b8dca1d3c 100644
--- a/js/data/locale/kl/dateformats.json
+++ b/js/data/locale/kl/dateformats.json
@@ -27,9 +27,9 @@
                 "s": "MM-dd"
             },
             "my": {
-                "f": "yyyy MMMM",
-                "l": "yyyy MMMM",
-                "m": "yyyy MMM",
+                "f": "yyyy LLLL",
+                "l": "yyyy LLLL",
+                "m": "yyyy LLL",
                 "s": "yyyy-MM"
             },
             "dw": {
@@ -61,6 +61,18 @@
                 "l": "yyyy",
                 "m": "yyyy",
                 "s": "yyyy"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "LL"
             }
         },
         "time": {
diff --git a/js/data/locale/kl/sysres.json b/js/data/locale/kl/sysres.json
index d5874f168d..a671355dd0 100644
--- a/js/data/locale/kl/sysres.json
+++ b/js/data/locale/kl/sysres.json
@@ -1,52 +1,100 @@
 {
-    "MMMM1": "januari",
+    "MMMM1": "januaarip",
     "MMM1": "jan",
     "NN1": "ja",
     "N1": "j",
-    "MMMM2": "februari",
-    "MMM2": "feb",
+    "MMMM2": "februaarip",
+    "MMM2": "febr",
     "NN2": "fe",
     "N2": "f",
-    "MMMM3": "martsi",
+    "MMMM3": "marsip",
     "MMM3": "mar",
     "NN3": "ma",
     "N3": "m",
-    "MMMM4": "aprili",
+    "MMMM4": "apriilip",
     "MMM4": "apr",
     "NN4": "ap",
     "N4": "a",
-    "MMMM5": "maji",
+    "MMMM5": "maajip",
     "MMM5": "maj",
     "NN5": "ma",
     "N5": "m",
-    "MMMM6": "juni",
+    "MMMM6": "juunip",
     "MMM6": "jun",
     "NN6": "ju",
     "N6": "j",
-    "MMMM7": "juli",
+    "MMMM7": "juulip",
     "MMM7": "jul",
     "NN7": "ju",
     "N7": "j",
-    "MMMM8": "augustusi",
+    "MMMM8": "aggustip",
     "MMM8": "aug",
     "NN8": "au",
     "N8": "a",
-    "MMMM9": "septemberi",
-    "MMM9": "sep",
+    "MMMM9": "septembarip",
+    "MMM9": "sept",
     "NN9": "se",
     "N9": "s",
-    "MMMM10": "oktoberi",
+    "MMMM10": "oktobarip",
     "MMM10": "okt",
     "NN10": "ok",
     "N10": "o",
-    "MMMM11": "novemberi",
+    "MMMM11": "novembarip",
     "MMM11": "nov",
     "NN11": "no",
     "N11": "n",
-    "MMMM12": "decemberi",
+    "MMMM12": "decembarip",
     "MMM12": "dec",
     "NN12": "de",
     "N12": "d",
+    "LLLL1": "januaari",
+    "LLL1": "jan",
+    "LL1": "ja",
+    "L1": "1",
+    "LLLL2": "februaari",
+    "LLL2": "febr",
+    "LL2": "fe",
+    "L2": "2",
+    "LLLL3": "marsi",
+    "LLL3": "mar",
+    "LL3": "ma",
+    "L3": "3",
+    "LLLL4": "apriili",
+    "LLL4": "apr",
+    "LL4": "ap",
+    "L4": "4",
+    "LLLL5": "maaji",
+    "LLL5": "maj",
+    "LL5": "ma",
+    "L5": "5",
+    "LLLL6": "juuni",
+    "LLL6": "jun",
+    "LL6": "ju",
+    "L6": "6",
+    "LLLL7": "juuli",
+    "LLL7": "jul",
+    "LL7": "ju",
+    "L7": "7",
+    "LLLL8": "aggusti",
+    "LLL8": "aug",
+    "LL8": "au",
+    "L8": "8",
+    "LLLL9": "septembari",
+    "LLL9": "sept",
+    "LL9": "se",
+    "L9": "9",
+    "LLLL10": "oktobari",
+    "LLL10": "okt",
+    "LL10": "ok",
+    "L10": "10",
+    "LLLL11": "novembari",
+    "LLL11": "nov",
+    "LL11": "no",
+    "L11": "11",
+    "LLLL12": "decembari",
+    "LLL12": "dec",
+    "LL12": "de",
+    "L12": "12",
     "EEEE0": "sapaat",
     "EEE0": "sap",
     "EE0": "sap",
@@ -75,6 +123,34 @@
     "EEE6": "arf",
     "EE6": "arf",
     "E6": "S",
+    "cccc0": "sapaat",
+    "ccc0": "sap",
+    "cc0": "sap",
+    "c0": "S",
+    "cccc1": "ataasinngorneq",
+    "ccc1": "ata",
+    "cc1": "ata",
+    "c1": "M",
+    "cccc2": "marlunngorneq",
+    "ccc2": "mar",
+    "cc2": "mar",
+    "c2": "T",
+    "cccc3": "pingasunngorneq",
+    "ccc3": "pin",
+    "cc3": "pin",
+    "c3": "W",
+    "cccc4": "sisamanngorneq",
+    "ccc4": "sis",
+    "cc4": "sis",
+    "c4": "T",
+    "cccc5": "tallimanngorneq",
+    "ccc5": "tal",
+    "cc5": "tal",
+    "c5": "F",
+    "cccc6": "arfininngorneq",
+    "ccc6": "arf",
+    "cc6": "arf",
+    "c6": "S",
     "a0": "AM",
     "a1": "PM",
     "G-1": "BCE",
diff --git a/js/data/locale/kn/sysres.json b/js/data/locale/kn/sysres.json
index 112c1c3d26..3ce298ab1d 100644
--- a/js/data/locale/kn/sysres.json
+++ b/js/data/locale/kn/sysres.json
@@ -99,16 +99,16 @@
     "1#1 se|#{num} sec": "one#{num}ಸೆಕೆಂ|#{num} ಸೆಕೆಂ",
     "1#1 mi|#{num} min": "one#{num}ನಿಮಿ|#{num}ನಿಮಿ",
     "durationMediumHours": "one#{num}ಗಂ.|#{num}ಗಂ.",
-    "1#1 dy|#{num} dys": "one#{num}ದಿನ|#{num}ದಿನ",
-    "durationMediumWeeks": "one#{num}ವಾರ|#{num}ವಾರ",
+    "1#1 dy|#{num} dys": "one#{num}ದಿ|#{num}ದಿ",
+    "durationMediumWeeks": "one#{num}ವಾ|#{num}ವಾ",
     "1#1 mo|#{num} mos": "one#{num}ತಿಂ.|#{num}ತಿಂ.",
     "durationMediumYears": "one#{num}ವ|#{num}ವ",
     "durationShortMillis": "one#{num}ಮಿ.ಸೆ.|#{num}ಮಿ.ಸೆ.",
     "#{num}s": "one#{num}ಸೆಕೆಂ|#{num} ಸೆಕೆಂ",
     "durationShortMinutes": "one#{num}ನಿಮಿ|#{num}ನಿಮಿ",
     "#{num}h": "one#{num}ಗಂ.|#{num}ಗಂ.",
-    "#{num}d": "one#{num}ದಿನ|#{num}ದಿನ",
-    "#{num}w": "one#{num}ವಾರ|#{num}ವಾರ",
+    "#{num}d": "one#{num}ದಿ|#{num}ದಿ",
+    "#{num}w": "one#{num}ವಾ|#{num}ವಾ",
     "durationShortMonths": "one#{num}ತಿಂ.|#{num}ತಿಂ.",
     "#{num}y": "one#{num}ವ|#{num}ವ",
     "1#in 1 second|#in {num} seconds": "one#{num} ಸೆಕೆಂಡ್‌ನಲ್ಲಿ|#{num} ಸೆಕೆಂಡ್‌ಗಳಲ್ಲಿ",
diff --git a/js/data/locale/ko/sysres.json b/js/data/locale/ko/sysres.json
index 44740cdb1c..2dcfbd5599 100644
--- a/js/data/locale/ko/sysres.json
+++ b/js/data/locale/ko/sysres.json
@@ -161,4 +161,4 @@
     "finalSeparatorMedium": " ",
     "separatorShort": " ",
     "finalSeparatorShort": " "
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/kok/sysres.json b/js/data/locale/kok/sysres.json
index cb95755bdc..48ab595d7d 100644
--- a/js/data/locale/kok/sysres.json
+++ b/js/data/locale/kok/sysres.json
@@ -75,42 +75,42 @@
     "EEE6": "शेनवार",
     "EE6": "शेन",
     "E6": "शे",
-    "a0": "म.पू.",
-    "a1": "म.नं.",
+    "a0": "AM",
+    "a1": "PM",
     "G-1": "BCE",
     "G1": "CE",
-    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 second|#{num} seconds": "#{num} s",
-    "1#1 minute|#{num} minutes": "#{num} min",
-    "1#1 hour|#{num} hours": "#{num} h",
-    "1#1 day|#{num} days": "#{num} d",
-    "1#1 week|#{num} weeks": "#{num} w",
-    "1#1 month|#{num} months": "#{num} m",
-    "1#1 year|#{num} years": "#{num} y",
-    "#{num} ms": "#{num} ms",
-    "1#1 sec|#{num} sec": "#{num} s",
-    "1#1 min|#{num} min": "#{num} min",
-    "1#1 hr|#{num} hrs": "#{num} h",
-    "durationLongDays": "#{num} d",
-    "1#1 wk|#{num} wks": "#{num} w",
-    "1#1 mon|#{num} mons": "#{num} m",
-    "1#1 yr|#{num} yrs": "#{num} y",
-    "durationMediumMillis": "#{num} ms",
-    "1#1 se|#{num} sec": "#{num} s",
-    "1#1 mi|#{num} min": "#{num} min",
-    "durationMediumHours": "#{num} h",
-    "1#1 dy|#{num} dys": "#{num} d",
-    "durationMediumWeeks": "#{num} w",
-    "1#1 mo|#{num} mos": "#{num} m",
-    "durationMediumYears": "#{num} y",
-    "durationShortMillis": "#{num} ms",
-    "#{num}s": "#{num} s",
-    "durationShortMinutes": "#{num} min",
-    "#{num}h": "#{num} h",
-    "#{num}d": "#{num} d",
-    "#{num}w": "#{num} w",
-    "durationShortMonths": "#{num} m",
-    "#{num}y": "#{num} y",
+    "1#1 millisecond|#{num} milliseconds": "#{num} मिलिसेकंदांनी",
+    "1#1 second|#{num} seconds": "#{num} सेकंदांनी",
+    "1#1 minute|#{num} minutes": "#{num} मिण्टां",
+    "1#1 hour|#{num} hours": "#{num} वरां",
+    "1#1 day|#{num} days": "#{num} दीस",
+    "1#1 week|#{num} weeks": "#{num} सप्तक",
+    "1#1 month|#{num} months": "#{num} म्हयने",
+    "1#1 year|#{num} years": "#{num} वर्सां",
+    "#{num} ms": "#{num} मिलिसेकंद",
+    "1#1 sec|#{num} sec": "#{num} सेकंद",
+    "1#1 min|#{num} min": "#{num} मिनीट",
+    "1#1 hr|#{num} hrs": "#{num} वर",
+    "durationLongDays": "#{num} दीस",
+    "1#1 wk|#{num} wks": "#{num} सप्तक",
+    "1#1 mon|#{num} mons": "#{num} म्हयने",
+    "1#1 yr|#{num} yrs": "#{num} वर्सां",
+    "durationMediumMillis": "#{num}मिसे",
+    "1#1 se|#{num} sec": "#{num}से",
+    "1#1 mi|#{num} min": "#{num} मि",
+    "durationMediumHours": "#{num} व",
+    "1#1 dy|#{num} dys": "#{num}दी",
+    "durationMediumWeeks": "#{num}स",
+    "1#1 mo|#{num} mos": "#{num}म्ह",
+    "durationMediumYears": "#{num}व",
+    "durationShortMillis": "#{num}मिसे",
+    "#{num}s": "#{num}से",
+    "durationShortMinutes": "#{num} मि",
+    "#{num}h": "#{num} व",
+    "#{num}d": "#{num}दी",
+    "#{num}w": "#{num}स",
+    "durationShortMonths": "#{num}म्ह",
+    "#{num}y": "#{num}व",
     "1#in 1 second|#in {num} seconds": "#{num} सेकंदानीं",
     "1#in 1 minute|#in {num} minutes": "#{num} मिन्टां",
     "1#in 1 hour|#in {num} hours": "#{num} वरांनीं",
@@ -129,7 +129,7 @@
     "#in {num}mi": "#{num} मिन्टां",
     "#in {num}h": "#{num} वरांनीं",
     "#in {num}d": "#{num} दिसानीं",
-    "#in {num}w": "#{num} सप्त.",
+    "#in {num}w": "#{num} सप्तकांनीं",
     "#in {num}mo": "#{num} म्हयन्यानीं",
     "#in {num}y": "#{num} वर्सांनीं",
     "1#1 second ago|#{num} seconds ago": "#{num} सेकंद आदीं",
@@ -159,6 +159,6 @@
     "finalSeparatorLong": ", ",
     "separatorMedium": ", ",
     "finalSeparatorMedium": ", ",
-    "separatorShort": ", ",
-    "finalSeparatorShort": ", "
+    "separatorShort": " ",
+    "finalSeparatorShort": " "
 }
\ No newline at end of file
diff --git a/js/data/locale/ks/dateformats.json b/js/data/locale/ks/dateformats.json
index d74707df20..8d692e2142 100644
--- a/js/data/locale/ks/dateformats.json
+++ b/js/data/locale/ks/dateformats.json
@@ -130,7 +130,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "‏{sm}/{sd}/{sy} – ‏{em}/{ed}/{ey}"
+                "s": "‏{sm}/{sd} – ‏{em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/ks/sysres.json b/js/data/locale/ks/sysres.json
index 750b657d38..34eb128891 100644
--- a/js/data/locale/ks/sysres.json
+++ b/js/data/locale/ks/sysres.json
@@ -51,21 +51,21 @@
     "EEE0": "آتھوار",
     "EE0": "آتھوار",
     "E0": "ا",
-    "EEEE1": "ژٔنٛدرٕروار",
-    "EEE1": "ژٔنٛدٕروار",
-    "EE1": "ژٔنٛدٕروار",
+    "EEEE1": "ژٔندرٕروار",
+    "EEE1": "ژٔندٕروار",
+    "EE1": "ژٔندٕروار",
     "E1": "ژ",
-    "EEEE2": "بوٚموار",
-    "EEE2": "بوٚموار",
-    "EE2": "بوٚموار",
+    "EEEE2": "بۆموار",
+    "EEE2": "بۆموار",
+    "EE2": "بۆموار",
     "E2": "ب",
     "EEEE3": "بودوار",
     "EEE3": "بودوار",
     "EE3": "بودوار",
     "E3": "ب",
-    "EEEE4": "برٛٮ۪سوار",
-    "EEE4": "برٛٮ۪سوار",
-    "EE4": "برٛٮ۪سوار",
+    "EEEE4": "برؠسوار",
+    "EEE4": "برؠسوار",
+    "EE4": "برؠسوار",
     "E4": "ب",
     "EEEE5": "جُمہ",
     "EEE5": "جُمہ",
@@ -80,12 +80,12 @@
     "G-1": "BCE",
     "G1": "CE",
     "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 second|#{num} seconds": "one#{num} سیٚکَنٛڈ|#{num} سیٚکَنٛڈ",
+    "1#1 second|#{num} seconds": "one#{num} سیکَنڈ|#{num} سیکَنڈ",
     "1#1 minute|#{num} minutes": "one#{num} مِنَٹ|#{num} مِنَٹ",
-    "1#1 hour|#{num} hours": "one#{num} گَنٹہٕ|#{num} گٲنٛٹہٕ",
+    "1#1 hour|#{num} hours": "one#{num} گَنٹہٕ|#{num} گٲنٹہٕ",
     "1#1 day|#{num} days": "one#{num} دۄہ|#{num} دۄہ",
     "1#1 week|#{num} weeks": "one#{num} ہَفتہٕ|#{num} ہَفتہٕ",
-    "1#1 month|#{num} months": "one#{num} ریٚتھ|#{num} ریٚتھ",
+    "1#1 month|#{num} months": "one#{num} ریتھ|#{num} ریتھ",
     "1#1 year|#{num} years": "one#{num} ؤری|#{num} ؤری",
     "#{num} ms": "#{num} ms",
     "1#1 sec|#{num} sec": "#{num} s",
diff --git a/js/data/locale/ku/sysres.json b/js/data/locale/ku/sysres.json
index 73c493eb54..16a464f768 100644
--- a/js/data/locale/ku/sysres.json
+++ b/js/data/locale/ku/sysres.json
@@ -220,4 +220,4 @@
     "#in {num}y": "#{num}س لە",
     "1#in 1 yr|#in {num} yrs": "#{num} سا لە",
     "1#in 1 year|#in {num} years": "#{num} ساڵ لە"
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/ky/sysres.json b/js/data/locale/ky/sysres.json
index 2eb7de7841..4430e14c1f 100644
--- a/js/data/locale/ky/sysres.json
+++ b/js/data/locale/ky/sysres.json
@@ -153,8 +153,8 @@
     "c6": "И",
     "a0": "таңкы",
     "a1": "түштөн кийинки",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "б.з.ч.",
+    "G1": "б.з.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} миллисекунд|#{num} миллисекунд",
     "1#1 second|#{num} seconds": "one#{num} секунд|#{num} секунд",
     "1#1 minute|#{num} minutes": "one#{num} мүнөт|#{num} мүнөт",
diff --git a/js/data/locale/lkt/dateformats.json b/js/data/locale/lkt/dateformats.json
index f7d137d150..5236af7871 100644
--- a/js/data/locale/lkt/dateformats.json
+++ b/js/data/locale/lkt/dateformats.json
@@ -3,40 +3,40 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "yyyy MMMM d, EEEE",
-                "l": "yyyy MMMM d, EEE",
-                "m": "yyyy MMM d, EE",
-                "s": "yyyy-MM-dd, E"
+                "f": "EEEE, MMMM d, yyyy",
+                "l": "EEE, MMMM d, yyyy",
+                "m": "EE, MMM d, yyyy",
+                "s": "E, M/d/yy"
             },
             "dmy": {
-                "f": "yyyy MMMM d",
-                "l": "yyyy MMMM d",
-                "m": "yyyy MMM d",
-                "s": "yyyy-MM-dd"
+                "f": "MMMM d, yyyy",
+                "l": "MMMM d, yyyy",
+                "m": "MMM d, yyyy",
+                "s": "M/d/yy"
             },
             "dmw": {
-                "f": "MMMM d, EEEE",
-                "l": "MMMM d, EEE",
-                "m": "MMM d, EE",
-                "s": "MM-dd, E"
+                "f": "EEEE, MMMM d",
+                "l": "EEE, MMMM d",
+                "m": "EE, MMM d",
+                "s": "E, M/d"
             },
             "dm": {
                 "f": "MMMM d",
                 "l": "MMMM d",
                 "m": "MMM d",
-                "s": "MM-dd"
+                "s": "M/d"
             },
             "my": {
-                "f": "yyyy MMMM",
-                "l": "yyyy MMMM",
-                "m": "yyyy MMM",
-                "s": "yyyy-MM"
+                "f": "MMMM, yyyy",
+                "l": "MMMM, yyyy",
+                "m": "MMM, yyyy",
+                "s": "M/yy"
             },
             "dw": {
-                "f": "d, EEEE",
-                "l": "d, EEE",
-                "m": "d, EE",
-                "s": "dd, E"
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, d"
             },
             "w": {
                 "f": "EEEE",
@@ -48,19 +48,19 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "dd"
+                "s": "d"
             },
             "m": {
                 "f": "MMMM",
                 "l": "MMMM",
                 "m": "MMM",
-                "s": "MM"
+                "s": "M"
             },
             "y": {
                 "f": "yyyy",
                 "l": "yyyy",
                 "m": "yyyy",
-                "s": "yyyy"
+                "s": "yy"
             }
         },
         "time": {
@@ -97,52 +97,52 @@
         },
         "range": {
             "c00": {
-                "f": "{sy} {sm} {sd} {st} – {et}",
-                "l": "{sy} {sm} {sd} {st} – {et}",
-                "m": "{sy} {sm} {sd} {st} – {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {et}"
+                "f": "{sm} {sd}, {sy} {st} – {et}",
+                "l": "{sm} {sd}, {sy} {st} – {et}",
+                "m": "{sm} {sd}, {sy} {st} – {et}",
+                "s": "{sm}/{sd}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "l": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "m": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
             "c02": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "l": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "m": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
             "c03": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "l": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "m": "{sm} {sd}, {sy} {st} – {em} {ed}, {ey} {et}",
+                "s": "{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}"
             },
             "c10": {
-                "f": "{sy} {sm} {sd} – {ed}",
-                "l": "{sy} {sm} {sd} – {ed}",
-                "m": "{sy} {sm} {sd} – {ed}",
-                "s": "{sy}-{sm}-{sd} – {ed}"
+                "f": "{sm} {sd} – {ed}, {ey}",
+                "l": "{sm} {sd} – {ed}, {ey}",
+                "m": "{sm} {sd} – {ed}, {ey}",
+                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
             },
             "c11": {
-                "f": "{sy} {sm} {sd} – {em} {ed}",
-                "l": "{sy} {sm} {sd} – {em} {ed}",
-                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+                "f": "{sm} {sd} – {em} {ed}, {ey}",
+                "l": "{sm} {sd} – {em} {ed}, {ey}",
+                "m": "{sm} {sd} – {em} {ed}, {ey}",
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
-                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+                "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
+                "l": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
+                "m": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
+                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
             },
             "c20": {
-                "f": "{sy} {sm} – {ey} {em}",
-                "l": "{sy} {sm} – {ey} {em}",
-                "m": "{sy} {sm} – {ey} {em}",
-                "s": "{sy}-{sm} – {ey}-{em}"
+                "f": "{sm}, {sy} – {em}, {ey}",
+                "l": "{sm}, {sy} – {em}, {ey}",
+                "m": "{sm}, {sy} – {em}, {ey}",
+                "s": "{sm}/{sy} – {em}/{ey}"
             },
             "c30": {
                 "f": "{sy} – {ey}",
diff --git a/js/data/locale/lo/sysres.json b/js/data/locale/lo/sysres.json
index 15f5dbe44e..7839afee70 100644
--- a/js/data/locale/lo/sysres.json
+++ b/js/data/locale/lo/sysres.json
@@ -112,14 +112,14 @@
     "durationShortMonths": "#{num} ດ.",
     "#{num}y": "#{num} ປ",
     "1#in 1 second|#in {num} seconds": "#ໃນອີກ {num} ວິນາທີ",
-    "1#in 1 minute|#in {num} minutes": "#{num} ໃນອີກ 0 ນາທີ",
+    "1#in 1 minute|#in {num} minutes": "#ໃນອີກ {num} ນາທີ",
     "1#in 1 hour|#in {num} hours": "#ໃນອີກ {num} ຊົ່ວໂມງ",
     "1#in 1 day|#in {num} days": "#ໃນອີກ {num} ມື້",
     "1#in 1 week|#in {num} weeks": "#ໃນອີກ {num} ອາທິດ",
     "1#in 1 month|#in {num} months": "#ໃນອີກ {num} ເດືອນ",
     "1#in 1 year|#in {num} years": "#ໃນອີກ {num} ປີ",
     "1#in 1 sec|#in {num} sec": "#ໃນອີກ {num} ວິນາທີ",
-    "1#in 1 min|#in {num} min": "#{num} ໃນອີກ 0 ນາທີ",
+    "1#in 1 min|#in {num} min": "#ໃນອີກ {num} ນາທີ",
     "1#in 1 hr|#in {num} hrs": "#ໃນອີກ {num} ຊົ່ວໂມງ",
     "1#in 1 dy|#in {num} dys": "#ໃນອີກ {num} ມື້",
     "1#in 1 wk|#in {num} wks": "#ໃນອີກ {num} ອາທິດ",
diff --git a/js/data/locale/lv/sysres.json b/js/data/locale/lv/sysres.json
index ae059a34c9..ba6f40c589 100644
--- a/js/data/locale/lv/sysres.json
+++ b/js/data/locale/lv/sysres.json
@@ -77,8 +77,8 @@
     "E6": "S",
     "a0": "priekšpusdienā",
     "a1": "pēcpusdienā",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "p.m.ē.",
+    "G1": "m.ē.",
     "1#1 millisecond|#{num} milliseconds": "zero#{num} milisekunžu|one#{num} milisekunde|#{num} milisekundes",
     "1#1 second|#{num} seconds": "zero#{num} sekunžu|one#{num} sekunde|#{num} sekundes",
     "1#1 minute|#{num} minutes": "zero#{num} minūšu|one#{num} minūte|#{num} minūtes",
@@ -89,25 +89,25 @@
     "1#1 year|#{num} years": "zero#{num} gadu|one#{num} gads|#{num} gadi",
     "#{num} ms": "zero#{num} ms|one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "zero#{num} sek.|one#{num} sek.|#{num} sek.",
-    "1#1 min|#{num} min": "zero#{num} min.|one#{num} min.|#{num} min.",
+    "1#1 min|#{num} min": "zero#{num} min.|one#{num} min.|#{num} min",
     "1#1 hr|#{num} hrs": "zero#{num} st.|one#{num} st.|#{num} st.",
     "durationLongDays": "zero#{num} d.|one#{num} d.|#{num} d.",
     "1#1 wk|#{num} wks": "zero#{num} ned.|one#{num} ned.|#{num} ned.",
     "1#1 mon|#{num} mons": "zero#{num} mēn.|one#{num} mēn.|#{num} mēn.",
     "1#1 yr|#{num} yrs": "zero#{num} g.|one#{num} g.|#{num} g.",
-    "durationMediumMillis": "zero#{num}ms|one#{num}ms|#{num}ms",
-    "1#1 se|#{num} sec": "zero#{num}s|one#{num}s|#{num}s",
+    "durationMediumMillis": "zero#{num} ms|one#{num} ms|#{num} ms",
+    "1#1 se|#{num} sec": "zero#{num} s|one#{num} s|#{num} s",
     "1#1 mi|#{num} min": "zero#{num} min|one#{num} min|#{num} min",
-    "durationMediumHours": "zero#{num}h|one#{num}h|#{num}h",
-    "1#1 dy|#{num} dys": "zero#{num}d|one#{num}d|#{num}d",
+    "durationMediumHours": "zero#{num} h|one#{num} h|#{num} h",
+    "1#1 dy|#{num} dys": "zero#{num} d.|one#{num} d.|#{num} d.",
     "durationMediumWeeks": "zero#{num} n.|one#{num} n.|#{num} n.",
     "1#1 mo|#{num} mos": "zero#{num} m.|one#{num} m.|#{num} m.",
     "durationMediumYears": "zero#{num} g.|one#{num} g.|#{num} g.",
-    "durationShortMillis": "zero#{num}ms|one#{num}ms|#{num}ms",
-    "#{num}s": "zero#{num}s|one#{num}s|#{num}s",
+    "durationShortMillis": "zero#{num} ms|one#{num} ms|#{num} ms",
+    "#{num}s": "zero#{num} s|one#{num} s|#{num} s",
     "durationShortMinutes": "zero#{num} min|one#{num} min|#{num} min",
-    "#{num}h": "zero#{num}h|one#{num}h|#{num}h",
-    "#{num}d": "zero#{num}d|one#{num}d|#{num}d",
+    "#{num}h": "zero#{num} h|one#{num} h|#{num} h",
+    "#{num}d": "zero#{num} d.|one#{num} d.|#{num} d.",
     "#{num}w": "zero#{num} n.|one#{num} n.|#{num} n.",
     "durationShortMonths": "zero#{num} m.|one#{num} m.|#{num} m.",
     "#{num}y": "zero#{num} g.|one#{num} g.|#{num} g.",
diff --git a/js/data/locale/mi/dateformats.json b/js/data/locale/mi/dateformats.json
index 85e4e23c47..4e0134dde1 100644
--- a/js/data/locale/mi/dateformats.json
+++ b/js/data/locale/mi/dateformats.json
@@ -3,40 +3,40 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "yyyy MMMM d, EEEE",
-                "l": "yyyy MMMM d, EEE",
-                "m": "yyyy MMM d, EE",
-                "s": "yyyy-MM-dd, E"
+                "f": "EEEE, d MMMM yyyy",
+                "l": "EEE, d MMMM yyyy",
+                "m": "EE, d MMM yyyy",
+                "s": "E, dd-MM-yyyy"
             },
             "dmy": {
-                "f": "yyyy MMMM d",
-                "l": "yyyy MMMM d",
-                "m": "yyyy MMM d",
-                "s": "yyyy-MM-dd"
+                "f": "d MMMM yyyy",
+                "l": "d MMMM yyyy",
+                "m": "d MMM yyyy",
+                "s": "dd-MM-yyyy"
             },
             "dmw": {
-                "f": "MMMM d, EEEE",
-                "l": "MMMM d, EEE",
-                "m": "MMM d, EE",
-                "s": "MM-dd, E"
+                "f": "EEEE, d MMMM",
+                "l": "EEE, d MMMM",
+                "m": "EE, d MMM",
+                "s": "E, dd-MM"
             },
             "dm": {
-                "f": "MMMM d",
-                "l": "MMMM d",
-                "m": "MMM d",
-                "s": "MM-dd"
+                "f": "d MMMM",
+                "l": "d MMMM",
+                "m": "d MMM",
+                "s": "dd-MM"
             },
             "my": {
-                "f": "yyyy MMMM",
-                "l": "yyyy MMMM",
-                "m": "yyyy MMM",
-                "s": "yyyy-MM"
+                "f": "MMMM yyyy",
+                "l": "MMMM yyyy",
+                "m": "MMM yyyy",
+                "s": "MM-yyyy"
             },
             "dw": {
-                "f": "d, EEEE",
-                "l": "d, EEE",
-                "m": "d, EE",
-                "s": "dd, E"
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, dd"
             },
             "w": {
                 "f": "EEEE",
@@ -69,80 +69,80 @@
                 "m": "mm",
                 "s": "ss",
                 "ah": "h a",
-                "hm": "",
+                "hm": "h:mm",
                 "ms": "mm:ss",
-                "ahm": "h:mm",
-                "hms": "",
-                "hmz": " z",
-                "ahmz": "h:mm z",
-                "ahms": "h:mm:ss",
-                "hmsz": " z",
-                "ahmsz": "h:mm:ss z"
+                "ahm": "h:mm a",
+                "hms": "h:mm:ss",
+                "hmz": "h:mm z",
+                "ahmz": "h:mm a z",
+                "ahms": "h:mm:ss a",
+                "hmsz": "h:mm:ss z",
+                "ahmsz": "h:mm:ss a z"
             },
             "24": {
                 "h": "HH",
                 "m": "mm",
                 "s": "ss",
                 "ah": "HH",
-                "hm": "",
+                "hm": "HH:mm",
                 "ms": "mm:ss",
-                "ahm": "",
-                "hms": "",
-                "hmz": " z",
-                "ahmz": " z",
-                "ahms": "",
-                "hmsz": " z",
-                "ahmsz": " z"
+                "ahm": "HH:mm",
+                "hms": "HH:mm:ss",
+                "hmz": "HH:mm z",
+                "ahmz": "HH:mm z",
+                "ahms": "HH:mm:ss",
+                "hmsz": "HH:mm:ss z",
+                "ahmsz": "HH:mm:ss z"
             }
         },
         "range": {
             "c00": {
-                "f": "{sy} {sm} {sd} {st} – {et}",
-                "l": "{sy} {sm} {sd} {st} – {et}",
-                "m": "{sy} {sm} {sd} {st} – {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {et}"
+                "f": "{sd} {sm} {sy} {st} – {et}",
+                "l": "{sd} {sm} {sy} {st} – {et}",
+                "m": "{sd} {sm} {sy} {st} – {et}",
+                "s": "{sd}-{sm}-{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c02": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c03": {
-                "f": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "l": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "m": "{sy} {sm} {sd} {st} – {ey} {em} {ed} {et}",
-                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c10": {
-                "f": "{sy} {sm} {sd} – {ed}",
-                "l": "{sy} {sm} {sd} – {ed}",
-                "m": "{sy} {sm} {sd} – {ed}",
-                "s": "{sy}-{sm}-{sd} – {ed}"
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
+                "m": "{sd} – {ed} {em} {ey}",
+                "s": "{sd} – {ed}-{em}-{ey}"
             },
             "c11": {
-                "f": "{sy} {sm} {sd} – {em} {ed}",
-                "l": "{sy} {sm} {sd} – {em} {ed}",
-                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
+                "m": "{sd} {sm} – {ed} {em} {ey}",
+                "s": "{sd}-{sm} – {ed}-{em}-{ey}"
             },
             "c12": {
-                "f": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "l": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "m": "{sy} {sm} {sd} – {ey} {em} {ed}",
-                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
+                "f": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "m": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "s": "{sd}-{sm}-{sy} – {ed}-{em}-{ey}"
             },
             "c20": {
-                "f": "{sy} {sm} – {ey} {em}",
-                "l": "{sy} {sm} – {ey} {em}",
-                "m": "{sy} {sm} – {ey} {em}",
-                "s": "{sy}-{sm} – {ey}-{em}"
+                "f": "{sm} {sy} – {em} {ey}",
+                "l": "{sm} {sy} – {em} {ey}",
+                "m": "{sm} {sy} – {em} {ey}",
+                "s": "{sm}-{sy} – {em}-{ey}"
             },
             "c30": {
                 "f": "{sy} – {ey}",
diff --git a/js/data/locale/mk/dateformats.json b/js/data/locale/mk/dateformats.json
index 43af96beeb..543acea41c 100644
--- a/js/data/locale/mk/dateformats.json
+++ b/js/data/locale/mk/dateformats.json
@@ -3,28 +3,28 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "EEEE, dd MMMM yyyy",
-                "l": "EEE, dd MMMM yyyy",
-                "m": "EE, dd.M.yyyy",
-                "s": "E, dd.M.yy"
+                "f": "EEEE, d MMMM yyyy",
+                "l": "EEE, d MMMM yyyy",
+                "m": "EE, d.M.yyyy",
+                "s": "E, d.M.yy"
             },
             "dmy": {
-                "f": "dd MMMM yyyy",
-                "l": "dd MMMM yyyy",
-                "m": "dd.M.yyyy",
-                "s": "dd.M.yy"
+                "f": "d MMMM yyyy",
+                "l": "d MMMM yyyy",
+                "m": "d.M.yyyy",
+                "s": "d.M.yy"
             },
             "dmw": {
-                "f": "EEEE, dd MMMM",
-                "l": "EEE, dd MMMM",
-                "m": "EE, dd.M",
-                "s": "E, dd.M"
+                "f": "EEEE, d MMMM",
+                "l": "EEE, d MMMM",
+                "m": "EE, d.M",
+                "s": "E, d.M"
             },
             "dm": {
-                "f": "dd MMMM",
-                "l": "dd MMMM",
-                "m": "dd.M",
-                "s": "dd.M"
+                "f": "d MMMM",
+                "l": "d MMMM",
+                "m": "d.M",
+                "s": "d.M"
             },
             "my": {
                 "f": "MMMM yyyy",
@@ -33,10 +33,10 @@
                 "s": "M.yy"
             },
             "dw": {
-                "f": "EEEE, dd",
-                "l": "EEE, dd",
-                "m": "EE, dd",
-                "s": "E, dd"
+                "f": "EEEE, d",
+                "l": "EEE, d",
+                "m": "EE, d",
+                "s": "E, d"
             },
             "w": {
                 "f": "EEEE",
@@ -45,10 +45,10 @@
                 "s": "E"
             },
             "d": {
-                "f": "dd",
-                "l": "dd",
-                "m": "dd",
-                "s": "dd"
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "d"
             },
             "m": {
                 "f": "MMMM",
diff --git a/js/data/locale/mk/sysres.json b/js/data/locale/mk/sysres.json
index 2c46b35d6e..ecd40af26b 100644
--- a/js/data/locale/mk/sysres.json
+++ b/js/data/locale/mk/sysres.json
@@ -78,7 +78,7 @@
     "a0": "претпладне",
     "a1": "попладне",
     "G-1": "п.н.е.",
-    "G1": "CE",
+    "G1": "н.е.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} милисекунда|#{num} милисекунди",
     "1#1 second|#{num} seconds": "one#{num} секунда|#{num} секунди",
     "1#1 minute|#{num} minutes": "one#{num} минута|#{num} минути",
diff --git a/js/data/locale/mn/dateformats.json b/js/data/locale/mn/dateformats.json
index 790bb4ceb3..4d42fc57f8 100644
--- a/js/data/locale/mn/dateformats.json
+++ b/js/data/locale/mn/dateformats.json
@@ -3,40 +3,40 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "yyyy.MM.dd, EEEE",
-                "l": "yyyy.MM.dd, EEE",
-                "m": "yyyy 'оны' MMM'ын' d, EE",
-                "s": "yyyy.MM.dd, E"
+                "f": "yyyy 'оны' MMMM'ын' d, EEEE 'гараг'",
+                "l": "yyyy 'оны' MMMM'ын' d, EEE 'гараг'",
+                "m": "yyyy 'оны' MMM'ын' d, EE 'гараг'",
+                "s": "yyyy.MM.dd, E 'гараг'"
             },
             "dmy": {
-                "f": "yyyy.MM.dd",
-                "l": "yyyy.MM.dd",
+                "f": "yyyy 'оны' MMMM'ын' d",
+                "l": "yyyy 'оны' MMMM'ын' d",
                 "m": "yyyy 'оны' MMM'ын' d",
                 "s": "yyyy.MM.dd"
             },
             "dmw": {
-                "f": "MM.dd, EEEE",
-                "l": "MM.dd, EEE",
-                "m": "MMM'ын' d, EE",
-                "s": "MM.dd, E"
+                "f": "MMMM'ын' d, EEEE 'гараг'",
+                "l": "MMMM'ын' d, EEE 'гараг'",
+                "m": "MMM'ын' d, EE 'гараг'",
+                "s": "MM.dd, E 'гараг'"
             },
             "dm": {
-                "f": "MM.dd",
-                "l": "MM.dd",
+                "f": "MMMM'ын' d",
+                "l": "MMMM'ын' d",
                 "m": "MMM'ын' d",
                 "s": "MM.dd"
             },
             "my": {
-                "f": "yyyy.MM",
-                "l": "yyyy.MM",
+                "f": "yyyy 'оны' LLLL",
+                "l": "yyyy 'оны' LLLL",
                 "m": "yyyy 'оны' LLL",
                 "s": "yyyy.MM"
             },
             "dw": {
-                "f": "dd, EEEE",
-                "l": "dd, EEE",
-                "m": "d, EE",
-                "s": "dd, E"
+                "f": "d, EEEE 'гараг'",
+                "l": "d, EEE 'гараг'",
+                "m": "d, EE 'гараг'",
+                "s": "dd, E 'гараг'"
             },
             "w": {
                 "f": "EEEE",
@@ -45,14 +45,14 @@
                 "s": "E"
             },
             "d": {
-                "f": "dd",
-                "l": "dd",
+                "f": "d",
+                "l": "d",
                 "m": "d",
                 "s": "dd"
             },
             "m": {
-                "f": "MM",
-                "l": "MM",
+                "f": "MMMM",
+                "l": "MMMM",
                 "m": "MMM",
                 "s": "MM"
             },
@@ -69,8 +69,8 @@
                 "s": "c"
             },
             "l": {
-                "f": "LL",
-                "l": "LL",
+                "f": "LLLL",
+                "l": "LLLL",
                 "m": "LLL",
                 "s": "LL"
             }
@@ -109,51 +109,51 @@
         },
         "range": {
             "c00": {
-                "f": "{sy}.{sm}.{sd} {st} – {et}",
-                "l": "{sy}.{sm}.{sd} {st} – {et}",
+                "f": "{sy} оны {sm}ын {sd} {st} – {et}",
+                "l": "{sy} оны {sm}ын {sd} {st} – {et}",
                 "m": "{sy} оны {sm}ын {sd} {st} – {et}",
                 "s": "{sy}.{sm}.{sd} {st} – {et}"
             },
             "c01": {
-                "f": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}",
-                "l": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}",
+                "f": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
+                "l": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
                 "m": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
                 "s": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}"
             },
             "c02": {
-                "f": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}",
-                "l": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}",
+                "f": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
+                "l": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
                 "m": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
                 "s": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}"
             },
             "c03": {
-                "f": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}",
-                "l": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}",
+                "f": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
+                "l": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
                 "m": "{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}",
                 "s": "{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}"
             },
             "c10": {
-                "f": "{sy}.{sm}.{sd} – {ed}",
-                "l": "{sy}.{sm}.{sd} – {ed}",
+                "f": "{sy} оны {sm}ын {sd} – {ed}",
+                "l": "{sy} оны {sm}ын {sd} – {ed}",
                 "m": "{sy} оны {sm}ын {sd} – {ed}",
                 "s": "{sy}.{sm}.{sd} – {ed}"
             },
             "c11": {
-                "f": "{sy}.{sm}.{sd} – {em}.{ed}",
-                "l": "{sy}.{sm}.{sd} – {em}.{ed}",
+                "f": "{sy} оны {sm}ын {sd} – {em}ын {ed}",
+                "l": "{sy} оны {sm}ын {sd} – {em}ын {ed}",
                 "m": "{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}",
                 "s": "{sy}.{sm}.{sd} – {ey}.{em}.{ed}"
             },
             "c12": {
-                "f": "{sy}.{sm}.{sd} – {ey}.{em}.{ed}",
-                "l": "{sy}.{sm}.{sd} – {ey}.{em}.{ed}",
+                "f": "{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}",
+                "l": "{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}",
                 "m": "{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}",
                 "s": "{sy}.{sm}.{sd} – {ey}.{em}.{ed}"
             },
             "c20": {
-                "f": "{sy}.{sm} – {ey}.{em}",
-                "l": "{sy}.{sm} – {ey}.{em}",
-                "m": "{sy} оны {sm}ын – {ey} оны {em}ын",
+                "f": "{sy} оны {sm} – {ey} оны {em}",
+                "l": "{sy} оны {sm} – {ey} оны {em}",
+                "m": "{sy} оны {sm} – {ey} оны {em}",
                 "s": "{sy}.{sm} – {ey}.{em}"
             },
             "c30": {
@@ -164,4 +164,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/mn/sysres.json b/js/data/locale/mn/sysres.json
index 2de3d98afe..b24fc2664a 100644
--- a/js/data/locale/mn/sysres.json
+++ b/js/data/locale/mn/sysres.json
@@ -155,11 +155,11 @@
     "a1": "ү.х.",
     "G-1": "НТӨ",
     "G1": "НТ",
-    "1#1 millisecond|#{num} milliseconds": "one#{num} милисекунд|#{num} милисекунд",
+    "1#1 millisecond|#{num} milliseconds": "one#{num} миллисекунд|#{num} миллисекунд",
     "1#1 second|#{num} seconds": "one#{num} секунд|#{num} секунд",
     "1#1 minute|#{num} minutes": "one#{num} минут|#{num} минут",
     "1#1 hour|#{num} hours": "one#{num} цаг|#{num} цаг",
-    "1#1 day|#{num} days": "one#{num} өдөр|#{num} өдөр",
+    "1#1 day|#{num} days": "one#{num} хоног|#{num} хоног",
     "1#1 week|#{num} weeks": "one#{num} долоо хоног|#{num} долоо хоног",
     "1#1 month|#{num} months": "one#{num} сар|#{num} сар",
     "1#1 year|#{num} years": "one#{num} жил|#{num} жил",
@@ -167,26 +167,26 @@
     "1#1 sec|#{num} sec": "one#{num} сек|#{num} сек",
     "1#1 min|#{num} min": "one#{num} мин|#{num} мин",
     "1#1 hr|#{num} hrs": "one#{num} цаг|#{num} цаг",
-    "durationLongDays": "one#{num} өдөр|#{num} өдөр",
-    "1#1 wk|#{num} wks": "one#{num} дол/хон|#{num} дол/хон",
+    "durationLongDays": "one#{num} хоног|#{num} хоног",
+    "1#1 wk|#{num} wks": "one#{num} д.х|#{num} д.х",
     "1#1 mon|#{num} mons": "one#{num} сар|#{num} сар",
     "1#1 yr|#{num} yrs": "one#{num} жил|#{num} жил",
     "durationMediumMillis": "one#{num} мс|#{num} мс",
     "1#1 se|#{num} sec": "one#{num} сек|#{num} сек",
     "1#1 mi|#{num} min": "one#{num} мин|#{num} мин",
     "durationMediumHours": "one#{num} ц|#{num} ц",
-    "1#1 dy|#{num} dys": "one#{num} өдөр|#{num} өдөр",
-    "durationMediumWeeks": "one#{num} д/х|#{num} д/х",
-    "1#1 mo|#{num} mos": "one#{num} сар|#{num} сар",
-    "durationMediumYears": "one#{num} жил|#{num} жил",
+    "1#1 dy|#{num} dys": "one#{num} хоног|#{num} хоног",
+    "durationMediumWeeks": "one#{num} д.х|#{num} д.х",
+    "1#1 mo|#{num} mos": "one#{num}с|#{num}с",
+    "durationMediumYears": "one#{num}ж|#{num}ж",
     "durationShortMillis": "one#{num} мс|#{num} мс",
     "#{num}s": "one#{num} сек|#{num} сек",
     "durationShortMinutes": "one#{num} мин|#{num} мин",
     "#{num}h": "one#{num} ц|#{num} ц",
-    "#{num}d": "one#{num} өдөр|#{num} өдөр",
-    "#{num}w": "one#{num} д/х|#{num} д/х",
-    "durationShortMonths": "one#{num} сар|#{num} сар",
-    "#{num}y": "one#{num} жил|#{num} жил",
+    "#{num}d": "one#{num} хоног|#{num} хоног",
+    "#{num}w": "one#{num} д.х|#{num} д.х",
+    "durationShortMonths": "one#{num}с|#{num}с",
+    "#{num}y": "one#{num}ж|#{num}ж",
     "1#in 1 second|#in {num} seconds": "one#{num} секундын дараа|#{num} секундын дараа",
     "1#in 1 minute|#in {num} minutes": "one#{num} минутын дараа|#{num} минутын дараа",
     "1#in 1 hour|#in {num} hours": "one#{num} цагийн дараа|#{num} цагийн дараа",
@@ -229,12 +229,12 @@
     "#{num}w ago": "one#{num} 7 хоногийн өмнө|#{num} 7 хоногийн өмнө",
     "#{num}mo ago": "one#{num} сарын өмнө|#{num} сарын өмнө",
     "#{num}y ago": "one#{num} жилийн өмнө|#{num} жилийн өмнө",
-    "separatorFull": ", ",
-    "finalSeparatorFull": ", ",
-    "separatorLong": ", ",
-    "finalSeparatorLong": ", ",
-    "separatorMedium": ", ",
-    "finalSeparatorMedium": ", ",
-    "separatorShort": ", ",
-    "finalSeparatorShort": ", "
-}
+    "separatorFull": " ",
+    "finalSeparatorFull": " ",
+    "separatorLong": " ",
+    "finalSeparatorLong": " ",
+    "separatorMedium": " ",
+    "finalSeparatorMedium": " ",
+    "separatorShort": " ",
+    "finalSeparatorShort": " "
+}
\ No newline at end of file
diff --git a/js/data/locale/ms/BN/dateformats.json b/js/data/locale/ms/BN/dateformats.json
index bac085ec96..6bc61dd819 100644
--- a/js/data/locale/ms/BN/dateformats.json
+++ b/js/data/locale/ms/BN/dateformats.json
@@ -8,10 +8,10 @@
         },
         "date": {
             "dmwy": {
-                "f": "dd MMMM yyyy",
-                "l": "d MMMM yyyy",
-                "m": "d MMM yyyy",
-                "s": "d/MM/yy"
+                "f": "EEEE dd MMMM yyyy",
+                "l": "EEE d MMMM yyyy",
+                "m": "EE d MMM yyyy",
+                "s": "E d/MM/yy"
             },
             "dmy": {
                 "f": "dd MMMM yyyy",
@@ -20,10 +20,10 @@
                 "s": "d/MM/yy"
             },
             "dmw": {
-                "f": "dd MMMM",
-                "l": "d MMMM",
-                "m": "d MMM",
-                "s": "d/MM"
+                "f": "EEEE dd MMMM",
+                "l": "EEE d MMMM",
+                "m": "EE d MMM",
+                "s": "E d/MM"
             },
             "dm": {
                 "f": "dd MMMM",
@@ -37,7 +37,12 @@
                 "m": "MMM yyyy",
                 "s": "MM/yy"
             },
-            "dw": {},
+            "dw": {
+                "f": "EEEE dd",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E d"
+            },
             "w": {
                 "f": "EEEE",
                 "l": "EEE",
diff --git a/js/data/locale/ne/sysres.json b/js/data/locale/ne/sysres.json
index eb996fb9cf..3002040d51 100644
--- a/js/data/locale/ne/sysres.json
+++ b/js/data/locale/ne/sysres.json
@@ -159,5 +159,6 @@
     "finalSeparatorLong": ",",
     "separatorMedium": ", ",
     "finalSeparatorMedium": ",",
+    "separatorShort": "",
     "finalSeparatorShort": " "
 }
\ No newline at end of file
diff --git a/js/data/locale/or/dateformats.json b/js/data/locale/or/dateformats.json
index 7c452dc496..488b665443 100644
--- a/js/data/locale/or/dateformats.json
+++ b/js/data/locale/or/dateformats.json
@@ -144,9 +144,9 @@
                 "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
             },
             "c20": {
-                "f": "{sm} {sy} – {em} {ey}",
-                "l": "{sm} {sy} – {em} {ey}",
-                "m": "{sm} {sy} – {em} {ey}",
+                "f": "{sm}, {sy} – {em}, {ey}",
+                "l": "{sm}, {sy} – {em}, {ey}",
+                "m": "{sm}, {sy} – {em}, {ey}",
                 "s": "{sm}/{sy} – {em}/{ey}"
             },
             "c30": {
@@ -157,4 +157,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/pa/Arab/sysres.json b/js/data/locale/pa/Arab/sysres.json
index 44cf40e505..3e260c09cf 100644
--- a/js/data/locale/pa/Arab/sysres.json
+++ b/js/data/locale/pa/Arab/sysres.json
@@ -152,5 +152,7 @@
     "#{num}d ago": "#-{num} d",
     "#{num}w ago": "#-{num} w",
     "#{num}mo ago": "#-{num} m",
-    "#{num}y ago": "#-{num} y"
+    "#{num}y ago": "#-{num} y",
+    "separatorShort": ", ",
+    "finalSeparatorShort": ", "
 }
\ No newline at end of file
diff --git a/js/data/locale/pa/sysres.json b/js/data/locale/pa/sysres.json
index d442edaecb..956964b73b 100644
--- a/js/data/locale/pa/sysres.json
+++ b/js/data/locale/pa/sysres.json
@@ -95,7 +95,7 @@
     "1#1 wk|#{num} wks": "one#{num} ਹਫ਼ਤਾ|#{num} ਹਫ਼ਤੇ",
     "1#1 mon|#{num} mons": "one#{num} ਮਹੀਨਾ|#{num} ਮਹੀਨੇ",
     "1#1 yr|#{num} yrs": "one#{num} ਸਾਲ|#{num} ਸਾਲ",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "one#{num} ਮਿਲੀਸਕਿੰਟ|#{num} ਮਿਲੀਸਕਿੰਟ",
     "1#1 se|#{num} sec": "one#{num} ਸਕਿੰਟ|#{num} ਸਕਿੰਟ",
     "1#1 mi|#{num} min": "one#{num} ਮਿੰਟ|#{num} ਮਿੰਟ",
     "durationMediumHours": "one#{num} ਘੰਟਾ|#{num} ਘੰਟੇ",
@@ -103,7 +103,7 @@
     "durationMediumWeeks": "one#{num} ਹਫ਼ਤਾ|#{num} ਹਫ਼ਤੇ",
     "1#1 mo|#{num} mos": "one#{num} ਮਹੀਨਾ|#{num} ਮਹੀਨੇ",
     "durationMediumYears": "one#{num} ਸਾਲ|#{num} ਸਾਲ",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "one#{num} ਮਿਲੀਸਕਿੰਟ|#{num} ਮਿਲੀਸਕਿੰਟ",
     "#{num}s": "one#{num} ਸਕਿੰਟ|#{num} ਸਕਿੰਟ",
     "durationShortMinutes": "one#{num} ਮਿੰਟ|#{num} ਮਿੰਟ",
     "#{num}h": "one#{num} ਘੰਟਾ|#{num} ਘੰਟੇ",
@@ -159,6 +159,6 @@
     "finalSeparatorLong": ", ",
     "separatorMedium": ", ",
     "finalSeparatorMedium": ", ",
-    "separatorShort": ", ",
-    "finalSeparatorShort": ", "
+    "separatorShort": " ",
+    "finalSeparatorShort": " "
 }
\ No newline at end of file
diff --git a/js/data/locale/pl/sysres.json b/js/data/locale/pl/sysres.json
index af350523ff..f7c4671694 100644
--- a/js/data/locale/pl/sysres.json
+++ b/js/data/locale/pl/sysres.json
@@ -163,25 +163,25 @@
     "1#1 week|#{num} weeks": "one#{num} tydzień|few#{num} tygodnie|many#{num} tygodni|#{num} tygodnia",
     "1#1 month|#{num} months": "one#{num} miesiąc|few#{num} miesiące|many#{num} miesięcy|#{num} miesiąca",
     "1#1 year|#{num} years": "one#{num} rok|few#{num} lata|many#{num} lat|#{num} roku",
-    "#{num} ms": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} sek.|few#{num} sek.|many#{num} sek.|#{num} sek.",
-    "1#1 min|#{num} min": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "1#1 min|#{num} min": "#{num} min",
     "1#1 hr|#{num} hrs": "one#{num} godz.|few#{num} godz.|many#{num} godz.|#{num} godz.",
     "durationLongDays": "one#{num} dzień|few#{num} dni|many#{num} dni|#{num} dnia",
     "1#1 wk|#{num} wks": "one#{num} tydz.|few#{num} tyg.|many#{num} tyg.|#{num} tyg.",
     "1#1 mon|#{num} mons": "one#{num} mies.|few#{num} mies.|many#{num} mies.|#{num} mies.",
     "1#1 yr|#{num} yrs": "one#{num} rok|few#{num} lata|many#{num} lat|#{num} roku",
-    "durationMediumMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "1#1 se|#{num} sec": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "1#1 mi|#{num} min": "#{num} min",
     "durationMediumHours": "one#{num} g.|few#{num} g.|many#{num} g.|#{num} g.",
     "1#1 dy|#{num} dys": "one#{num} d.|few#{num} dn.|many#{num} dn.|#{num} dn.",
     "durationMediumWeeks": "one#{num} tydz.|few#{num} tyg.|many#{num} tyg.|#{num} tyg.",
     "1#1 mo|#{num} mos": "one#{num} m-c|few#{num} m-ce|many#{num} m-cy|#{num} m-ca",
     "durationMediumYears": "one#{num} r.|few#{num} l.|many#{num} l.|#{num} r.",
-    "durationShortMillis": "one#{num} ms|few#{num} ms|many#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "#{num}s": "one#{num} s|few#{num} s|many#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} min|few#{num} min|many#{num} min|#{num} min",
+    "durationShortMinutes": "#{num} min",
     "#{num}h": "one#{num} g.|few#{num} g.|many#{num} g.|#{num} g.",
     "#{num}d": "one#{num} d.|few#{num} dn.|many#{num} dn.|#{num} dn.",
     "#{num}w": "one#{num} tydz.|few#{num} tyg.|many#{num} tyg.|#{num} tyg.",
diff --git a/js/data/locale/ps/PK/dateformats.json b/js/data/locale/ps/PK/dateformats.json
new file mode 100644
index 0000000000..40f04ae719
--- /dev/null
+++ b/js/data/locale/ps/PK/dateformats.json
@@ -0,0 +1,167 @@
+{
+    "gregorian": {
+        "order": "{date} {time}",
+        "date": {
+            "dmwy": {
+                "f": "EEEE د yyyy د MMMM d",
+                "l": "EEE د yyyy د MMMM d",
+                "m": "EE yyyy MMM d",
+                "s": "E yyyy/M/d"
+            },
+            "dmy": {
+                "f": "د yyyy د MMMM d",
+                "l": "د yyyy د MMMM d",
+                "m": "‏yyyy MMM d",
+                "s": "‏yyyy/M/d"
+            },
+            "dmw": {
+                "f": "EEEE MMMM d",
+                "l": "EEE MMMM d",
+                "m": "EE MMM d",
+                "s": "E ‏M/d"
+            },
+            "dm": {
+                "f": "MMMM d",
+                "l": "MMMM d",
+                "m": "MMM d",
+                "s": "‏M/d"
+            },
+            "my": {
+                "f": "د yyyy د LLLL",
+                "l": "د yyyy د LLLL",
+                "m": "‏yyyy LLL",
+                "s": "‏yyyy/M"
+            },
+            "dw": {
+                "f": "EEEE d",
+                "l": "EEE d",
+                "m": "EE d",
+                "s": "E d"
+            },
+            "w": {
+                "f": "EEEE",
+                "l": "EEE",
+                "m": "EE",
+                "s": "E"
+            },
+            "d": {
+                "f": "d",
+                "l": "d",
+                "m": "d",
+                "s": "d"
+            },
+            "m": {
+                "f": "MMMM",
+                "l": "MMMM",
+                "m": "MMM",
+                "s": "M"
+            },
+            "y": {
+                "f": "yyyy",
+                "l": "yyyy",
+                "m": "yyyy",
+                "s": "yyyy"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LLL",
+                "s": "L"
+            }
+        },
+        "time": {
+            "12": {
+                "h": "h",
+                "m": "mm",
+                "s": "ss",
+                "ah": "‏h a",
+                "hm": "‏h:mm",
+                "ms": "mm:ss",
+                "ahm": "‏h:mm a",
+                "hms": "‏h:mm:ss",
+                "hmz": "‏h:mm z",
+                "ahmz": "‏h:mm a z",
+                "ahms": "‏h:mm:ss a",
+                "hmsz": "‏h:mm:ss z",
+                "ahmsz": "‏h:mm:ss a z"
+            },
+            "24": {
+                "h": "HH",
+                "m": "mm",
+                "s": "ss",
+                "ah": "‏HH",
+                "hm": "‏HH:mm",
+                "ms": "mm:ss",
+                "ahm": "‏HH:mm",
+                "hms": "‏HH:mm:ss",
+                "hmz": "‏HH:mm z",
+                "ahmz": "‏HH:mm z",
+                "ahms": "‏HH:mm:ss",
+                "hmsz": "‏HH:mm:ss z",
+                "ahmsz": "‏HH:mm:ss z"
+            }
+        },
+        "range": {
+            "c00": {
+                "f": "د {sy} د {sm} {sd} {st} – {et}",
+                "l": "د {sy} د {sm} {sd} {st} – {et}",
+                "m": "‏{sy} {sm} {sd} {st} – {et}",
+                "s": "‏{sy}/{sm}/{sd} {st} – {et}"
+            },
+            "c01": {
+                "f": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "l": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "m": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
+                "s": "‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}"
+            },
+            "c02": {
+                "f": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "l": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "m": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
+                "s": "‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}"
+            },
+            "c03": {
+                "f": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "l": "د {sy} د {sm} {sd} {st} – د {ey} د {em} {ed} {et}",
+                "m": "‏{sy} {sm} {sd} {st} – ‏{ey} {em} {ed} {et}",
+                "s": "‏{sy}/{sm}/{sd} {st} – ‏{ey}/{em}/{ed} {et}"
+            },
+            "c10": {
+                "f": "د {sy} د {sm} {sd} – {ed}",
+                "l": "د {sy} د {sm} {sd} – {ed}",
+                "m": "‏{sy} {sm} {sd} – {ed}",
+                "s": "‏{sy}/{sm}/{sd} – {ed}"
+            },
+            "c11": {
+                "f": "د {sy} د {sm} {sd} – د {em} {ed}",
+                "l": "د {sy} د {sm} {sd} – د {em} {ed}",
+                "m": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
+                "s": "‏{sy}/{sm}/{sd} – ‏{ey}/{em}/{ed}"
+            },
+            "c12": {
+                "f": "د {sy} د {sm} {sd} – د {ey} د {em} {ed}",
+                "l": "د {sy} د {sm} {sd} – د {ey} د {em} {ed}",
+                "m": "‏{sy} {sm} {sd} – ‏{ey} {em} {ed}",
+                "s": "‏{sy}/{sm}/{sd} – ‏{ey}/{em}/{ed}"
+            },
+            "c20": {
+                "f": "د {sy} د {sm} – د {ey} د {em}",
+                "l": "د {sy} د {sm} – د {ey} د {em}",
+                "m": "‏{sy} {sm} – ‏{ey} {em}",
+                "s": "‏{sy}/{sm} – ‏{ey}/{em}"
+            },
+            "c30": {
+                "f": "‏{sy} – {ey}",
+                "l": "‏{sy} – {ey}",
+                "m": "‏{sy} – {ey}",
+                "s": "‏{sy} – {ey}"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/data/locale/ps/PK/sysres.json b/js/data/locale/ps/PK/sysres.json
new file mode 100644
index 0000000000..a431f6c766
--- /dev/null
+++ b/js/data/locale/ps/PK/sysres.json
@@ -0,0 +1,11 @@
+{
+    "1#1 day|#{num} days": "one#{num} ورځ|#{num} ورځے",
+    "1#1 month|#{num} months": "one#{num} مياشت|#{num} مياشتے",
+    "durationLongDays": "one#{num} ورځ|#{num} ورځے",
+    "1#in 1 year|#in {num} years": "one#‏په {num} کال کے|#‏په {num} کالونو کے",
+    "1#in 1 yr|#in {num} yrs": "one#‏په {num} کال کے|#‏په {num} کالونو کے",
+    "#in {num}y": "one#‏په {num} کال کے|#‏په {num} کالونو کے",
+    "1#1 year ago|#{num} years ago": "one#‏{num} کال مخکے|#‏{num} کاله مخکے",
+    "1#1 yr ago|#{num} yrs ago": "one#‏{num} کال مخکے|#‏{num} کاله مخکے",
+    "#{num}y ago": "one#‏{num} کال مخکے|#‏{num} کاله مخکے"
+}
\ No newline at end of file
diff --git a/js/data/locale/ps/sysres.json b/js/data/locale/ps/sysres.json
index 94e3cdb802..d7bc192d7c 100644
--- a/js/data/locale/ps/sysres.json
+++ b/js/data/locale/ps/sysres.json
@@ -27,9 +27,9 @@
     "MMM7": "جولای",
     "NN7": "جو",
     "N7": "ج",
-    "MMMM8": "اگست",
-    "MMM8": "اگست",
-    "NN8": "اگ",
+    "MMMM8": "اګست",
+    "MMM8": "اګست",
+    "NN8": "اګ",
     "N8": "ا",
     "MMMM9": "سېپتمبر",
     "MMM9": "سېپتمبر",
@@ -75,9 +75,9 @@
     "LLL7": "جولای",
     "LL7": "جو",
     "L7": "7",
-    "LLLL8": "اگست",
-    "LLL8": "اگست",
-    "LL8": "اگ",
+    "LLLL8": "اګست",
+    "LLL8": "اګست",
+    "LL8": "اګ",
     "L8": "8",
     "LLLL9": "سپتمبر",
     "LLL9": "سپتمبر",
@@ -173,7 +173,7 @@
     "1#1 yr|#{num} yrs": "one#{num} y|#{num} y",
     "durationMediumMillis": "one#{num} ms|#{num} ms",
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 mi|#{num} min": "one#{num} min|#{num}m",
     "durationMediumHours": "one#{num} h|#{num} h",
     "1#1 dy|#{num} dys": "one#{num} ورځ|#{num}d",
     "durationMediumWeeks": "one#{num} w|#{num} w",
@@ -181,53 +181,53 @@
     "durationMediumYears": "one#{num} y|#{num} y",
     "durationShortMillis": "one#{num} ms|#{num} ms",
     "#{num}s": "one#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMinutes": "one#{num} min|#{num}m",
     "#{num}h": "one#{num} h|#{num} h",
     "#{num}d": "one#{num} ورځ|#{num}d",
     "#{num}w": "one#{num} w|#{num} w",
     "durationShortMonths": "one#{num} m|#{num} m",
     "#{num}y": "one#{num} y|#{num} y",
-    "1#in 1 second|#in {num} seconds": "one#‏+{num} s|#‏+{num} s",
-    "1#in 1 minute|#in {num} minutes": "one#‏+{num} min|#‏+{num} min",
-    "1#in 1 hour|#in {num} hours": "one#‏+{num} h|#‏+{num} h",
-    "1#in 1 day|#in {num} days": "one#‏+{num} d|#‏+{num} d",
-    "1#in 1 week|#in {num} weeks": "one#‏+{num} w|#‏+{num} w",
-    "1#in 1 month|#in {num} months": "one#‏+{num} m|#‏+{num} m",
+    "1#in 1 second|#in {num} seconds": "one#‏په {num} ثانيه کې|#‏په {num} ثانيو کې",
+    "1#in 1 minute|#in {num} minutes": "one#‏په {num} دقيقه کې|#‏په {num} دقيقو کې",
+    "1#in 1 hour|#in {num} hours": "one#‏په {num} ساعت کې|#‏په {num} ساعتو کې",
+    "1#in 1 day|#in {num} days": "one#‏په {num} ورځ کې|#‏په {num} ورځو کې",
+    "1#in 1 week|#in {num} weeks": "one#‏په {num} اونۍ کې|#‏په {num} اونيو کې",
+    "1#in 1 month|#in {num} months": "one#‏په {num} مياشت کې|#‏په {num} مياشتو کې",
     "1#in 1 year|#in {num} years": "one#‏په {num} کال کې|#‏په {num} کالونو کې",
-    "1#in 1 sec|#in {num} sec": "one#‏+{num} s|#‏+{num} s",
-    "1#in 1 min|#in {num} min": "one#‏+{num} min|#‏+{num} min",
-    "1#in 1 hr|#in {num} hrs": "one#‏+{num} h|#‏+{num} h",
-    "1#in 1 dy|#in {num} dys": "one#‏+{num} d|#‏+{num} d",
-    "1#in 1 wk|#in {num} wks": "one#‏+{num} w|#‏+{num} w",
-    "1#in 1 mon|#in {num} mons": "one#‏+{num} m|#‏+{num} m",
+    "1#in 1 sec|#in {num} sec": "one#‏په {num} ثانيه کې|#‏په {num} ثانيو کې",
+    "1#in 1 min|#in {num} min": "one#‏په {num} دقيقه کې|#‏په {num} دقيقو کې",
+    "1#in 1 hr|#in {num} hrs": "one#‏په {num} ساعت کې|#‏په {num} ساعتو کې",
+    "1#in 1 dy|#in {num} dys": "one#‏په {num} ورځ کې|#‏په {num} ورځو کې",
+    "1#in 1 wk|#in {num} wks": "one#‏په {num} اونۍ کې|#‏په {num} اونيو کې",
+    "1#in 1 mon|#in {num} mons": "one#‏په {num} مياشت کې|#‏په {num} مياشتو کې",
     "1#in 1 yr|#in {num} yrs": "one#‏په {num} کال کې|#‏په {num} کالونو کې",
-    "#in {num}s": "one#‏+{num} s|#‏+{num} s",
-    "#in {num}mi": "one#‏+{num} min|#‏+{num} min",
-    "#in {num}h": "one#‏+{num} h|#‏+{num} h",
-    "#in {num}d": "one#‏+{num} d|#‏+{num} d",
-    "#in {num}w": "one#‏+{num} w|#‏+{num} w",
-    "#in {num}mo": "one#‏+{num} m|#‏+{num} m",
+    "#in {num}s": "one#‏په {num} ثانيه کې|#‏په {num} ثانيه کې",
+    "#in {num}mi": "one#‏په {num} دقيقه کې|#‏په {num} دقيقه کې",
+    "#in {num}h": "one#‏په {num} ساعت کې|#‏په {num} ساعت کې",
+    "#in {num}d": "one#‏په {num} ورځ کې|#‏په {num} ورځو کې",
+    "#in {num}w": "one#‏په {num} اونۍ کې|#‏په {num} اونۍ کې",
+    "#in {num}mo": "one#‏په {num} مياشت کې|#‏په {num} مياشت کې",
     "#in {num}y": "one#‏په {num} کال کې|#‏په {num} کالونو کې",
-    "1#1 second ago|#{num} seconds ago": "one#‏-{num} s|#‏-{num} s",
-    "1#1 minute ago|#{num} minutes ago": "one#‏-{num} min|#‏-{num} min",
-    "1#1 hour ago|#{num} hours ago": "one#‏-{num} h|#‏-{num} h",
-    "1#1 day ago|#{num} days ago": "one#‏-{num} d|#‏-{num} d",
-    "1#1 week ago|#{num} weeks ago": "one#‏-{num} w|#‏-{num} w",
-    "1#1 month ago|#{num} months ago": "one#‏-{num} m|#‏-{num} m",
+    "1#1 second ago|#{num} seconds ago": "one#‏{num} ثانيه مخکې|#‏{num} ثانيې مخکې",
+    "1#1 minute ago|#{num} minutes ago": "one#‏{num} دقيقه مخکې|#‏{num} دقيقې مخکې",
+    "1#1 hour ago|#{num} hours ago": "one#‏{num} ساعت مخکې|#‏{num} ساعتونه مخکې",
+    "1#1 day ago|#{num} days ago": "one#‏{num} ورځ مخکې|#‏{num} ورځې مخکې",
+    "1#1 week ago|#{num} weeks ago": "one#‏{num} اونۍ مخکې|#‏{num} اونۍ مخکې",
+    "1#1 month ago|#{num} months ago": "one#‏{num} مياشت مخکې|#‏{num} مياشتې مخکې",
     "1#1 year ago|#{num} years ago": "one#‏{num} کال مخکې|#‏{num} کاله مخکې",
-    "1#1 sec ago|#{num} sec ago": "one#‏-{num} s|#‏-{num} s",
-    "1#1 min ago|#{num} min ago": "one#‏-{num} min|#‏-{num} min",
-    "1#1 hr ago|#{num} hrs ago": "one#‏-{num} h|#‏-{num} h",
-    "1#1 dy ago|#{num} dys ago": "one#‏-{num} d|#‏-{num} d",
-    "1#1 wk ago|#{num} wks ago": "one#‏-{num} w|#‏-{num} w",
-    "1#1 mon ago|#{num} mons ago": "one#‏-{num} m|#‏-{num} m",
+    "1#1 sec ago|#{num} sec ago": "one#‏{num} ثانيه مخکې|#‏{num} ثانيې مخکې",
+    "1#1 min ago|#{num} min ago": "one#‏{num} دقيقه مخکې|#‏{num} دقيقې مخکې",
+    "1#1 hr ago|#{num} hrs ago": "one#‏{num} ساعت مخکې|#‏{num} ساعتونه مخکې",
+    "1#1 dy ago|#{num} dys ago": "one#‏{num} ورځ مخکې|#‏{num} ورځې مخکې",
+    "1#1 wk ago|#{num} wks ago": "one#‏{num} اونۍ مخکې|#‏{num} اونۍ مخکې",
+    "1#1 mon ago|#{num} mons ago": "one#‏{num} مياشت مخکې|#‏{num} مياشتې مخکې",
     "1#1 yr ago|#{num} yrs ago": "one#‏{num} کال مخکې|#‏{num} کاله مخکې",
-    "#{num}s ago": "one#‏-{num} s|#‏-{num} s",
-    "#{num}mi ago": "one#‏-{num} min|#‏-{num} min",
-    "#{num}h ago": "one#‏-{num} h|#‏-{num} h",
-    "#{num}d ago": "one#‏-{num} d|#‏-{num} d",
-    "#{num}w ago": "one#‏-{num} w|#‏-{num} w",
-    "#{num}mo ago": "one#‏-{num} m|#‏-{num} m",
+    "#{num}s ago": "one#‏{num} ثانيه مخکې|#‏{num} ثانيه مخکې",
+    "#{num}mi ago": "one#‏{num} دقيقه مخکې|#‏{num} دقيقه مخکې",
+    "#{num}h ago": "one#‏{num} ساعت مخکې|#‏{num} ساعت مخکې",
+    "#{num}d ago": "one#‏{num} ورځ مخکې|#‏{num} ورځې مخکې",
+    "#{num}w ago": "one#‏{num} اونۍ مخکې|#‏{num} اونۍ مخکې",
+    "#{num}mo ago": "one#‏{num} مياشت مخکې|#‏{num} مياشت مخکې",
     "#{num}y ago": "one#‏{num} کال مخکې|#‏{num} کاله مخکې",
     "separatorFull": ", ",
     "finalSeparatorFull": ", ",
diff --git a/js/data/locale/pt/AO/sysres.json b/js/data/locale/pt/AO/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/AO/sysres.json
+++ b/js/data/locale/pt/AO/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/CH/sysres.json b/js/data/locale/pt/CH/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/CH/sysres.json
+++ b/js/data/locale/pt/CH/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/CV/sysres.json b/js/data/locale/pt/CV/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/CV/sysres.json
+++ b/js/data/locale/pt/CV/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/GQ/sysres.json b/js/data/locale/pt/GQ/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/GQ/sysres.json
+++ b/js/data/locale/pt/GQ/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/GW/sysres.json b/js/data/locale/pt/GW/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/GW/sysres.json
+++ b/js/data/locale/pt/GW/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/LU/sysres.json b/js/data/locale/pt/LU/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/LU/sysres.json
+++ b/js/data/locale/pt/LU/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/MO/sysres.json b/js/data/locale/pt/MO/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/MO/sysres.json
+++ b/js/data/locale/pt/MO/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/MZ/sysres.json b/js/data/locale/pt/MZ/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/MZ/sysres.json
+++ b/js/data/locale/pt/MZ/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/PT/sysres.json b/js/data/locale/pt/PT/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/PT/sysres.json
+++ b/js/data/locale/pt/PT/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/ST/sysres.json b/js/data/locale/pt/ST/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/ST/sysres.json
+++ b/js/data/locale/pt/ST/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/TL/sysres.json b/js/data/locale/pt/TL/sysres.json
index 7c8b9a9f0e..a8e295fea9 100644
--- a/js/data/locale/pt/TL/sysres.json
+++ b/js/data/locale/pt/TL/sysres.json
@@ -1,16 +1,32 @@
 {
     "EEE0": "domingo",
+    "EE0": "domingo",
     "EEE1": "segunda",
+    "EE1": "segunda",
     "EEE2": "terça",
+    "EE2": "terça",
     "EEE3": "quarta",
+    "EE3": "quarta",
     "EEE4": "quinta",
+    "EE4": "quinta",
     "EEE5": "sexta",
+    "EE5": "sexta",
     "EEE6": "sábado",
+    "EE6": "sábado",
     "a0": "da manhã",
     "a1": "da tarde",
     "G-1": "a.E.C.",
     "G1": "E.C.",
+    "#{num} ms": "one#{num} ms|#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} s|#{num} s",
+    "1#1 min|#{num} min": "one#{num} min|#{num} min",
+    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "durationMediumHours": "one#{num} h|#{num} h",
+    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMinutes": "one#{num} min|#{num} min",
+    "#{num}h": "one#{num} h|#{num} h",
     "1#in 1 second|#in {num} seconds": "one#dentro de {num} segundo|#dentro de {num} segundos",
     "1#in 1 minute|#in {num} minutes": "one#dentro de {num} minuto|#dentro de {num} minutos",
     "1#in 1 hour|#in {num} hours": "one#dentro de {num} hora|#dentro de {num} horas",
@@ -33,5 +49,7 @@
     "#in {num}mo": "one#dentro de {num} mês|#dentro de {num} meses",
     "#in {num}y": "one#dentro de {num} ano|#dentro de {num} anos",
     "#{num}s ago": "one#há {num} s|#há {num} s",
-    "#{num}mi ago": "one#há {num} min|#há {num} min"
+    "#{num}mi ago": "one#há {num} min|#há {num} min",
+    "separatorShort": ", ",
+    "finalSeparatorShort": " e "
 }
\ No newline at end of file
diff --git a/js/data/locale/pt/sysres.json b/js/data/locale/pt/sysres.json
index cf5b1f344c..e11d659b34 100644
--- a/js/data/locale/pt/sysres.json
+++ b/js/data/locale/pt/sysres.json
@@ -1,79 +1,79 @@
 {
     "MMMM1": "janeiro",
-    "MMM1": "jan",
+    "MMM1": "jan.",
     "NN1": "ja",
     "N1": "j",
     "MMMM2": "fevereiro",
-    "MMM2": "fev",
+    "MMM2": "fev.",
     "NN2": "fe",
     "N2": "f",
     "MMMM3": "março",
-    "MMM3": "mar",
+    "MMM3": "mar.",
     "NN3": "ma",
     "N3": "m",
     "MMMM4": "abril",
-    "MMM4": "abr",
+    "MMM4": "abr.",
     "NN4": "ab",
     "N4": "a",
     "MMMM5": "maio",
-    "MMM5": "mai",
+    "MMM5": "mai.",
     "NN5": "ma",
     "N5": "m",
     "MMMM6": "junho",
-    "MMM6": "jun",
+    "MMM6": "jun.",
     "NN6": "ju",
     "N6": "j",
     "MMMM7": "julho",
-    "MMM7": "jul",
+    "MMM7": "jul.",
     "NN7": "ju",
     "N7": "j",
     "MMMM8": "agosto",
-    "MMM8": "ago",
+    "MMM8": "ago.",
     "NN8": "ag",
     "N8": "a",
     "MMMM9": "setembro",
-    "MMM9": "set",
+    "MMM9": "set.",
     "NN9": "se",
     "N9": "s",
     "MMMM10": "outubro",
-    "MMM10": "out",
+    "MMM10": "out.",
     "NN10": "ou",
     "N10": "o",
     "MMMM11": "novembro",
-    "MMM11": "nov",
+    "MMM11": "nov.",
     "NN11": "no",
     "N11": "n",
     "MMMM12": "dezembro",
-    "MMM12": "dez",
+    "MMM12": "dez.",
     "NN12": "de",
     "N12": "d",
     "EEEE0": "domingo",
-    "EEE0": "dom",
-    "EE0": "dom",
+    "EEE0": "dom.",
+    "EE0": "dom.",
     "E0": "D",
     "EEEE1": "segunda-feira",
-    "EEE1": "seg",
-    "EE1": "seg",
+    "EEE1": "seg.",
+    "EE1": "seg.",
     "E1": "S",
     "EEEE2": "terça-feira",
-    "EEE2": "ter",
-    "EE2": "ter",
+    "EEE2": "ter.",
+    "EE2": "ter.",
     "E2": "T",
     "EEEE3": "quarta-feira",
-    "EEE3": "qua",
-    "EE3": "qua",
+    "EEE3": "qua.",
+    "EE3": "qua.",
     "E3": "Q",
     "EEEE4": "quinta-feira",
-    "EEE4": "qui",
-    "EE4": "qui",
+    "EEE4": "qui.",
+    "EE4": "qui.",
     "E4": "Q",
     "EEEE5": "sexta-feira",
-    "EEE5": "sex",
-    "EE5": "sex",
+    "EEE5": "sex.",
+    "EE5": "sex.",
     "E5": "S",
     "EEEE6": "sábado",
-    "EEE6": "sáb",
-    "EE6": "sáb",
+    "EEE6": "sáb.",
+    "EE6": "sáb.",
     "E6": "S",
     "a0": "AM",
     "a1": "PM",
@@ -87,26 +87,26 @@
     "1#1 week|#{num} weeks": "one#{num} semana|#{num} semanas",
     "1#1 month|#{num} months": "one#{num} mês|#{num} meses",
     "1#1 year|#{num} years": "one#{num} ano|#{num} anos",
-    "#{num} ms": "one#{num} ms|#{num} ms",
+    "#{num} ms": "#{num} ms",
     "1#1 sec|#{num} sec": "one#{num} seg|#{num} seg",
-    "1#1 min|#{num} min": "one#{num} min|#{num} min",
-    "1#1 hr|#{num} hrs": "one#{num} h|#{num} h",
+    "1#1 min|#{num} min": "#{num} min",
+    "1#1 hr|#{num} hrs": "#{num} h",
     "durationLongDays": "one#{num} dia|#{num} dias",
     "1#1 wk|#{num} wks": "one#{num} sem.|#{num} sem.",
     "1#1 mon|#{num} mons": "one#{num} mês|#{num} meses",
     "1#1 yr|#{num} yrs": "one#{num} ano|#{num} anos",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
+    "durationMediumMillis": "#{num} ms",
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
-    "durationMediumHours": "one#{num} h|#{num} h",
+    "1#1 mi|#{num} min": "#{num} min",
+    "durationMediumHours": "#{num} h",
     "1#1 dy|#{num} dys": "one#{num} dia|#{num} dias",
     "durationMediumWeeks": "one#{num} sem.|#{num} sem.",
     "1#1 mo|#{num} mos": "one#{num} mês|#{num} meses",
     "durationMediumYears": "one#{num} ano|#{num} anos",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
+    "durationShortMillis": "#{num} ms",
     "#{num}s": "one#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} min|#{num} min",
-    "#{num}h": "one#{num} h|#{num} h",
+    "durationShortMinutes": "#{num} min",
+    "#{num}h": "#{num} h",
     "#{num}d": "one#{num} dia|#{num} dias",
     "#{num}w": "one#{num} sem.|#{num} sem.",
     "durationShortMonths": "one#{num} mês|#{num} meses",
@@ -159,6 +159,6 @@
     "finalSeparatorLong": " e ",
     "separatorMedium": ", ",
     "finalSeparatorMedium": " e ",
-    "separatorShort": ", ",
-    "finalSeparatorShort": " e "
+    "separatorShort": " ",
+    "finalSeparatorShort": " "
 }
\ No newline at end of file
diff --git a/js/data/locale/qu/sysres.json b/js/data/locale/qu/sysres.json
index 377e32a62c..a0dad290e4 100644
--- a/js/data/locale/qu/sysres.json
+++ b/js/data/locale/qu/sysres.json
@@ -79,14 +79,14 @@
     "a1": "p.m.",
     "G-1": "BCE",
     "G1": "CE",
-    "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 second|#{num} seconds": "#{num} s",
-    "1#1 minute|#{num} minutes": "#{num} min",
-    "1#1 hour|#{num} hours": "#{num} h",
-    "1#1 day|#{num} days": "#{num} d",
-    "1#1 week|#{num} weeks": "#{num} w",
-    "1#1 month|#{num} months": "#{num} m",
-    "1#1 year|#{num} years": "#{num} y",
+    "1#1 millisecond|#{num} milliseconds": "#{num} milisegundo",
+    "1#1 second|#{num} seconds": "#{num} segundo",
+    "1#1 minute|#{num} minutes": "#{num} minuto",
+    "1#1 hour|#{num} hours": "#{num} hora",
+    "1#1 day|#{num} days": "#{num} punchaw",
+    "1#1 week|#{num} weeks": "#{num} semana",
+    "1#1 month|#{num} months": "#{num} killa",
+    "1#1 year|#{num} years": "#{num} wata",
     "#{num} ms": "#{num} ms",
     "1#1 sec|#{num} sec": "#{num} s",
     "1#1 min|#{num} min": "#{num} min",
@@ -99,18 +99,18 @@
     "1#1 se|#{num} sec": "#{num} s",
     "1#1 mi|#{num} min": "#{num} min",
     "durationMediumHours": "#{num} h",
-    "1#1 dy|#{num} dys": "#{num} d",
-    "durationMediumWeeks": "#{num} w",
-    "1#1 mo|#{num} mos": "#{num} m",
-    "durationMediumYears": "#{num} y",
+    "1#1 dy|#{num} dys": "#{num} p",
+    "durationMediumWeeks": "#{num} s",
+    "1#1 mo|#{num} mos": "#{num} k",
+    "durationMediumYears": "#{num} w",
     "durationShortMillis": "#{num} ms",
     "#{num}s": "#{num} s",
     "durationShortMinutes": "#{num} min",
     "#{num}h": "#{num} h",
-    "#{num}d": "#{num} d",
-    "#{num}w": "#{num} w",
-    "durationShortMonths": "#{num} m",
-    "#{num}y": "#{num} y",
+    "#{num}d": "#{num} p",
+    "#{num}w": "#{num} s",
+    "durationShortMonths": "#{num} k",
+    "#{num}y": "#{num} w",
     "1#in 1 second|#in {num} seconds": "#+{num} s",
     "1#in 1 minute|#in {num} minutes": "#+{num} min",
     "1#in 1 hour|#in {num} hours": "#+{num} h",
diff --git a/js/data/locale/rm/dateformats.json b/js/data/locale/rm/dateformats.json
index fbed21a0bf..1062d6bc95 100644
--- a/js/data/locale/rm/dateformats.json
+++ b/js/data/locale/rm/dateformats.json
@@ -3,32 +3,32 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "EEEE, 'ils' d 'da' MMMM yyyy",
-                "l": "EEE, 'ils' d 'da' MMMM yyyy",
+                "f": "EEEE, 'ils' d MMMM yyyy",
+                "l": "EEE, 'ils' d MMMM yyyy",
                 "m": "EE, 'ils' dd-MM-yyyy",
                 "s": "E, 'ils' dd-MM-yy"
             },
             "dmy": {
-                "f": "d 'da' MMMM yyyy",
-                "l": "d 'da' MMMM yyyy",
+                "f": "d MMMM yyyy",
+                "l": "d MMMM yyyy",
                 "m": "dd-MM-yyyy",
                 "s": "dd-MM-yy"
             },
             "dmw": {
-                "f": "EEEE, 'ils' d 'da' MMMM",
-                "l": "EEE, 'ils' d 'da' MMMM",
+                "f": "EEEE, 'ils' d MMMM",
+                "l": "EEE, 'ils' d MMMM",
                 "m": "EE, 'ils' dd-MM",
                 "s": "E, 'ils' dd-MM"
             },
             "dm": {
-                "f": "d 'da' MMMM",
-                "l": "d 'da' MMMM",
+                "f": "d MMMM",
+                "l": "d MMMM",
                 "m": "dd-MM",
                 "s": "dd-MM"
             },
             "my": {
-                "f": "MMMM yyyy",
-                "l": "MMMM yyyy",
+                "f": "LLLL yyyy",
+                "l": "LLLL yyyy",
                 "m": "MM-yyyy",
                 "s": "MM-yy"
             },
@@ -61,6 +61,18 @@
                 "l": "yyyy",
                 "m": "yyyy",
                 "s": "yy"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLLL",
+                "l": "LLLL",
+                "m": "LL",
+                "s": "LL"
             }
         },
         "time": {
@@ -97,44 +109,44 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} da {sm} {sy} {st} – {et}",
-                "l": "{sd} da {sm} {sy} {st} – {et}",
+                "f": "{sd} {sm} {sy} {st} – {et}",
+                "l": "{sd} {sm} {sy} {st} – {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} da {sm} {sy} {st} – {ed} da {em} {ey} {et}",
-                "l": "{sd} da {sm} {sy} {st} – {ed} da {em} {ey} {et}",
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c02": {
-                "f": "{sd} da {sm} {sy} {st} – {ed} da {em} {ey} {et}",
-                "l": "{sd} da {sm} {sy} {st} – {ed} da {em} {ey} {et}",
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c03": {
-                "f": "{sd} da {sm} {sy} {st} – {ed} da {em} {ey} {et}",
-                "l": "{sd} da {sm} {sy} {st} – {ed} da {em} {ey} {et}",
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "m": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}",
                 "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
             },
             "c10": {
-                "f": "{sd} – {ed} da {em} {ey}",
-                "l": "{sd} – {ed} da {em} {ey}",
+                "f": "{sd} – {ed} {em} {ey}",
+                "l": "{sd} – {ed} {em} {ey}",
                 "m": "{sd} – {ed}-{em}-{ey}",
                 "s": "{sd} – {ed}-{em}-{ey}"
             },
             "c11": {
-                "f": "{sd} da {sm} – {ed} da {em} {ey}",
-                "l": "{sd} da {sm} – {ed} da {em} {ey}",
+                "f": "{sd} {sm} – {ed} {em} {ey}",
+                "l": "{sd} {sm} – {ed} {em} {ey}",
                 "m": "{sd}-{sm} – {ed}-{em}-{ey}",
                 "s": "{sd}-{sm} – {ed}-{em}-{ey}"
             },
             "c12": {
-                "f": "{sd} da {sm} {sy} – {ed} da {em} {ey}",
-                "l": "{sd} da {sm} {sy} – {ed} da {em} {ey}",
+                "f": "{sd} {sm} {sy} – {ed} {em} {ey}",
+                "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
                 "m": "{sd}-{sm}-{sy} – {ed}-{em}-{ey}",
                 "s": "{sd}-{sm}-{sy} – {ed}-{em}-{ey}"
             },
diff --git a/js/data/locale/rm/sysres.json b/js/data/locale/rm/sysres.json
index c902ea27c2..3bd5a1ad93 100644
--- a/js/data/locale/rm/sysres.json
+++ b/js/data/locale/rm/sysres.json
@@ -1,52 +1,100 @@
 {
-    "MMMM1": "schaner",
+    "MMMM1": "da schaner",
     "MMM1": "schan.",
     "NN1": "sc",
     "N1": "s",
-    "MMMM2": "favrer",
+    "MMMM2": "da favrer",
     "MMM2": "favr.",
     "NN2": "fa",
     "N2": "f",
-    "MMMM3": "mars",
+    "MMMM3": "da mars",
     "MMM3": "mars",
     "NN3": "ma",
     "N3": "m",
-    "MMMM4": "avrigl",
+    "MMMM4": "d’avrigl",
     "MMM4": "avr.",
     "NN4": "av",
     "N4": "a",
-    "MMMM5": "matg",
+    "MMMM5": "da matg",
     "MMM5": "matg",
     "NN5": "ma",
     "N5": "m",
-    "MMMM6": "zercladur",
+    "MMMM6": "da zercladur",
     "MMM6": "zercl.",
     "NN6": "ze",
     "N6": "z",
-    "MMMM7": "fanadur",
+    "MMMM7": "da fanadur",
     "MMM7": "fan.",
     "NN7": "fa",
     "N7": "f",
-    "MMMM8": "avust",
+    "MMMM8": "d’avust",
     "MMM8": "avust",
     "NN8": "av",
     "N8": "a",
-    "MMMM9": "settember",
+    "MMMM9": "da settember",
     "MMM9": "sett.",
     "NN9": "se",
     "N9": "s",
-    "MMMM10": "october",
+    "MMMM10": "d’october",
     "MMM10": "oct.",
     "NN10": "oc",
     "N10": "o",
-    "MMMM11": "november",
+    "MMMM11": "da november",
     "MMM11": "nov.",
     "NN11": "no",
     "N11": "n",
-    "MMMM12": "december",
+    "MMMM12": "da december",
     "MMM12": "dec.",
     "NN12": "de",
     "N12": "d",
+    "LLLL1": "schaner",
+    "LLL1": "schan.",
+    "LL1": "sc",
+    "L1": "S",
+    "LLLL2": "favrer",
+    "LLL2": "favr.",
+    "LL2": "fa",
+    "L2": "F",
+    "LLLL3": "mars",
+    "LLL3": "mars",
+    "LL3": "ma",
+    "L3": "M",
+    "LLLL4": "avrigl",
+    "LLL4": "avr.",
+    "LL4": "av",
+    "L4": "A",
+    "LLLL5": "matg",
+    "LLL5": "matg",
+    "LL5": "ma",
+    "L5": "M",
+    "LLLL6": "zercladur",
+    "LLL6": "zercl.",
+    "LL6": "ze",
+    "L6": "Z",
+    "LLLL7": "fanadur",
+    "LLL7": "fan.",
+    "LL7": "fa",
+    "L7": "F",
+    "LLLL8": "avust",
+    "LLL8": "avust",
+    "LL8": "av",
+    "L8": "A",
+    "LLLL9": "settember",
+    "LLL9": "sett.",
+    "LL9": "se",
+    "L9": "S",
+    "LLLL10": "october",
+    "LLL10": "oct.",
+    "LL10": "oc",
+    "L10": "O",
+    "LLLL11": "november",
+    "LLL11": "nov.",
+    "LL11": "no",
+    "L11": "N",
+    "LLLL12": "december",
+    "LLL12": "dec.",
+    "LL12": "de",
+    "L12": "D",
     "EEEE0": "dumengia",
     "EEE0": "du",
     "EE0": "du",
@@ -75,6 +123,34 @@
     "EEE6": "so",
     "EE6": "so",
     "E6": "S",
+    "cccc0": "dumengia",
+    "ccc0": "du",
+    "cc0": "du",
+    "c0": "D",
+    "cccc1": "glindesdi",
+    "ccc1": "gli",
+    "cc1": "gli",
+    "c1": "G",
+    "cccc2": "mardi",
+    "ccc2": "ma",
+    "cc2": "ma",
+    "c2": "M",
+    "cccc3": "mesemna",
+    "ccc3": "me",
+    "cc3": "me",
+    "c3": "M",
+    "cccc4": "gievgia",
+    "ccc4": "gie",
+    "cc4": "gie",
+    "c4": "G",
+    "cccc5": "venderdi",
+    "ccc5": "ve",
+    "cc5": "ve",
+    "c5": "V",
+    "cccc6": "sonda",
+    "ccc6": "so",
+    "cc6": "so",
+    "c6": "S",
     "a0": "AM",
     "a1": "PM",
     "G-1": "BCE",
diff --git a/js/data/locale/ro/MD/sysres.json b/js/data/locale/ro/MD/sysres.json
index 8eab2e9e01..1919104d22 100644
--- a/js/data/locale/ro/MD/sysres.json
+++ b/js/data/locale/ro/MD/sysres.json
@@ -15,16 +15,12 @@
     "EE5": "Vi",
     "EEE6": "Sâm",
     "EE6": "Sâ",
-    "durationMediumMillis": "one#{num}ms|few#{num}ms|#{num}ms",
-    "1#1 mi|#{num} min": "one#{num}min.|few#{num}min.|#{num}min.",
-    "1#1 dy|#{num} dys": "one#{num}zi|few#{num}zile|#{num}zile",
-    "durationMediumWeeks": "one#{num}săpt.|few#{num}săpt.|#{num}săpt.",
-    "1#1 mo|#{num} mos": "one#{num}lună|few#{num}luni|#{num}luni",
-    "durationMediumYears": "one#{num}an|few#{num}ani|#{num}ani",
-    "durationShortMillis": "one#{num}ms|few#{num}ms|#{num}ms",
-    "durationShortMinutes": "one#{num}min.|few#{num}min.|#{num}min.",
-    "#{num}d": "one#{num}zi|few#{num}zile|#{num}zile",
-    "#{num}w": "one#{num}săpt.|few#{num}săpt.|#{num}săpt.",
-    "durationShortMonths": "one#{num}lună|few#{num}luni|#{num}luni",
-    "#{num}y": "one#{num}an|few#{num}ani|#{num}ani"
+    "1#1 mi|#{num} min": "one#{num} min.|few#{num} min.|#{num} min.",
+    "1#1 dy|#{num} dys": "one#{num} zi|few#{num} zile|#{num} zile",
+    "1#1 mo|#{num} mos": "one#{num} lună|few#{num} luni|#{num} luni",
+    "durationMediumYears": "one#{num} an|few#{num} ani|#{num} ani",
+    "durationShortMinutes": "one#{num} min.|few#{num} min.|#{num} min.",
+    "#{num}d": "one#{num} zi|few#{num} zile|#{num} zile",
+    "durationShortMonths": "one#{num} lună|few#{num} luni|#{num} luni",
+    "#{num}y": "one#{num} an|few#{num} ani|#{num} ani"
 }
\ No newline at end of file
diff --git a/js/data/locale/ru/sysres.json b/js/data/locale/ru/sysres.json
index e4c1e9179a..b0e6161301 100644
--- a/js/data/locale/ru/sysres.json
+++ b/js/data/locale/ru/sysres.json
@@ -153,7 +153,7 @@
     "c6": "С",
     "a0": "AM",
     "a1": "PM",
-    "G-1": "BCE",
+    "G-1": "до н. э.",
     "G1": "н. э.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} миллисекунда|few#{num} миллисекунды|many#{num} миллисекунд|#{num} миллисекунды",
     "1#1 second|#{num} seconds": "one#{num} секунда|few#{num} секунды|many#{num} секунд|#{num} секунды",
@@ -166,7 +166,7 @@
     "#{num} ms": "one#{num} мс|few#{num} мс|many#{num} мс|#{num} мс",
     "1#1 sec|#{num} sec": "one#{num} сек.|few#{num} сек.|many#{num} сек.|#{num} сек.",
     "1#1 min|#{num} min": "one#{num} мин.|few#{num} мин.|many#{num} мин.|#{num} мин.",
-    "1#1 hr|#{num} hrs": "one#{num} ч.|few#{num} ч.|many#{num} ч.|#{num} ч.",
+    "1#1 hr|#{num} hrs": "one#{num} ч|few#{num} ч|many#{num} ч|#{num} ч",
     "durationLongDays": "one#{num} дн.|few#{num} дн.|many#{num} дн.|#{num} дн.",
     "1#1 wk|#{num} wks": "one#{num} нед.|few#{num} нед.|many#{num} нед.|#{num} нед.",
     "1#1 mon|#{num} mons": "one#{num} мес.|few#{num} мес.|many#{num} мес.|#{num} мес.",
@@ -203,7 +203,7 @@
     "1#in 1 yr|#in {num} yrs": "one#через {num} год|few#через {num} года|many#через {num} лет|#через {num} года",
     "#in {num}s": "one#через {num} сек.|few#через {num} сек.|many#через {num} сек.|#через {num} сек.",
     "#in {num}mi": "one#через {num} мин.|few#через {num} мин.|many#через {num} мин.|#через {num} мин.",
-    "#in {num}h": "one#через {num} ч.|few#через {num} ч.|many#через {num} ч.|#через {num} ч.",
+    "#in {num}h": "one#через {num} ч|few#через {num} ч|many#через {num} ч|#через {num} ч",
     "#in {num}d": "one#через {num} дн.|few#через {num} дн.|many#через {num} дн.|#через {num} дн.",
     "#in {num}w": "one#через {num} нед.|few#через {num} нед.|many#через {num} нед.|#через {num} нед.",
     "#in {num}mo": "one#через {num} мес.|few#через {num} мес.|many#через {num} мес.|#через {num} мес.",
@@ -224,7 +224,7 @@
     "1#1 yr ago|#{num} yrs ago": "one#{num} год назад|few#{num} года назад|many#{num} лет назад|#{num} года назад",
     "#{num}s ago": "one#{num} сек. назад|few#{num} сек. назад|many#{num} сек. назад|#{num} сек. назад",
     "#{num}mi ago": "one#{num} мин. назад|few#{num} мин. назад|many#{num} мин. назад|#{num} мин. назад",
-    "#{num}h ago": "one#{num} ч. назад|few#{num} ч. назад|many#{num} ч. назад|#{num} ч. назад",
+    "#{num}h ago": "one#{num} ч назад|few#{num} ч назад|many#{num} ч назад|#{num} ч назад",
     "#{num}d ago": "one#{num} дн. назад|few#{num} дн. назад|many#{num} дн. назад|#{num} дн. назад",
     "#{num}w ago": "one#{num} нед. назад|few#{num} нед. назад|many#{num} нед. назад|#{num} нед. назад",
     "#{num}mo ago": "one#{num} мес. назад|few#{num} мес. назад|many#{num} мес. назад|#{num} мес. назад",
diff --git a/js/data/locale/so/sysres.json b/js/data/locale/so/sysres.json
index a6ffa16d26..d0846670f7 100644
--- a/js/data/locale/so/sysres.json
+++ b/js/data/locale/so/sysres.json
@@ -1,51 +1,51 @@
 {
     "MMMM1": "Bisha Koobaad",
-    "MMM1": "Kob",
-    "NN1": "Ko",
-    "N1": "K",
+    "MMM1": "Jan",
+    "NN1": "Ja",
+    "N1": "J",
     "MMMM2": "Bisha Labaad",
-    "MMM2": "Lab",
-    "NN2": "La",
-    "N2": "L",
+    "MMM2": "Feb",
+    "NN2": "Fe",
+    "N2": "F",
     "MMMM3": "Bisha Saddexaad",
-    "MMM3": "Sad",
-    "NN3": "Sa",
-    "N3": "S",
+    "MMM3": "Mar",
+    "NN3": "Ma",
+    "N3": "M",
     "MMMM4": "Bisha Afraad",
-    "MMM4": "Afr",
-    "NN4": "Af",
+    "MMM4": "Abr",
+    "NN4": "Ab",
     "N4": "A",
     "MMMM5": "Bisha Shanaad",
     "MMM5": "May",
     "NN5": "Ma",
     "N5": "M",
     "MMMM6": "Bisha Lixaad",
-    "MMM6": "Juun",
+    "MMM6": "Jun",
     "NN6": "Ju",
     "N6": "J",
     "MMMM7": "Bisha Todobaad",
-    "MMM7": "Luuliyo",
+    "MMM7": "Lul",
     "NN7": "Lu",
     "N7": "L",
     "MMMM8": "Bisha Sideedaad",
-    "MMM8": "Og",
+    "MMM8": "Ogs",
     "NN8": "Og",
     "N8": "O",
     "MMMM9": "Bisha Sagaalaad",
-    "MMM9": "Sebtembar",
+    "MMM9": "Seb",
     "NN9": "Se",
     "N9": "S",
     "MMMM10": "Bisha Tobnaad",
-    "MMM10": "Oktoobar",
+    "MMM10": "Okt",
     "NN10": "Ok",
     "N10": "O",
     "MMMM11": "Bisha Kow iyo Tobnaad",
-    "MMM11": "Nofembar",
+    "MMM11": "Nof",
     "NN11": "No",
     "N11": "N",
     "MMMM12": "Bisha Laba iyo Tobnaad",
-    "MMM12": "Dec",
-    "NN12": "De",
+    "MMM12": "Dis",
+    "NN12": "Di",
     "N12": "D",
     "LLLL1": "Jannaayo",
     "LLL1": "Jan",
@@ -68,15 +68,15 @@
     "LL5": "Ma",
     "L5": "M",
     "LLLL6": "Juun",
-    "LLL6": "Juun",
+    "LLL6": "Jun",
     "LL6": "Ju",
     "L6": "J",
     "LLLL7": "Luuliyo",
-    "LLL7": "Luuliyo",
+    "LLL7": "Lul",
     "LL7": "Lu",
     "L7": "L",
     "LLLL8": "Ogost",
-    "LLL8": "Og",
+    "LLL8": "Ogs",
     "LL8": "Og",
     "L8": "O",
     "LLLL9": "Sebtembar",
@@ -92,8 +92,8 @@
     "LL11": "No",
     "L11": "N",
     "LLLL12": "Desembar",
-    "LLL12": "Des",
-    "LL12": "De",
+    "LLL12": "Dis",
+    "LL12": "Di",
     "L12": "D",
     "EEEE0": "Axad",
     "EEE0": "Axd",
@@ -104,24 +104,24 @@
     "EE1": "Isn",
     "E1": "I",
     "EEEE2": "Talaado",
-    "EEE2": "Tal",
-    "EE2": "Tal",
+    "EEE2": "Tldo",
+    "EE2": "Tldo",
     "E2": "T",
     "EEEE3": "Arbaco",
-    "EEE3": "Arb",
-    "EE3": "Arb",
+    "EEE3": "Arbc",
+    "EE3": "Arbc",
     "E3": "A",
     "EEEE4": "Khamiis",
-    "EEE4": "Kha",
-    "EE4": "Kha",
+    "EEE4": "Khms",
+    "EE4": "Khms",
     "E4": "Kh",
     "EEEE5": "Jimco",
-    "EEE5": "Jim",
-    "EE5": "Jim",
+    "EEE5": "Jmc",
+    "EE5": "Jmc",
     "E5": "J",
     "EEEE6": "Sabti",
-    "EEE6": "Sab",
-    "EE6": "Sab",
+    "EEE6": "Sbti",
+    "EE6": "Sbti",
     "E6": "S",
     "cccc0": "Axad",
     "ccc0": "Axd",
@@ -132,105 +132,105 @@
     "cc1": "Isn",
     "c1": "I",
     "cccc2": "Talaado",
-    "ccc2": "Tal",
-    "cc2": "Tal",
+    "ccc2": "Tldo",
+    "cc2": "Tldo",
     "c2": "T",
     "cccc3": "Arbaco",
-    "ccc3": "Arb",
-    "cc3": "Arb",
+    "ccc3": "Arbc",
+    "cc3": "Arbc",
     "c3": "A",
     "cccc4": "Khamiis",
-    "ccc4": "Kha",
-    "cc4": "Kha",
+    "ccc4": "Khms",
+    "cc4": "Khms",
     "c4": "Kh",
     "cccc5": "Jimco",
-    "ccc5": "Jim",
-    "cc5": "Jim",
+    "ccc5": "Jmc",
+    "cc5": "Jmc",
     "c5": "J",
     "cccc6": "Sabti",
-    "ccc6": "Sab",
-    "cc6": "Sab",
+    "ccc6": "Sbti",
+    "cc6": "Sbti",
     "c6": "S",
-    "a0": "sn.",
-    "a1": "gn.",
-    "G-1": "BCE",
-    "G1": "CE",
-    "1#1 millisecond|#{num} milliseconds": "one#{num} ms|#{num} ms",
-    "1#1 second|#{num} seconds": "one#{num} il-biriqsi|#{num} il-biriqsi",
-    "1#1 minute|#{num} minutes": "one#{num} daqiiqad|#{num} daqiiqad",
-    "1#1 hour|#{num} hours": "one#{num} saacad|#{num} saacado",
-    "1#1 day|#{num} days": "one#{num} maalin|#{num} maalmooyin",
-    "1#1 week|#{num} weeks": "one#Usbuuc/Sitimaan|#{num} Usbuucyo",
-    "1#1 month|#{num} months": "one#{num}Bil|#{num}Bil",
-    "1#1 year|#{num} years": "one#{num} Sannad|#{num}Sannado",
-    "#{num} ms": "one#{num} ms|#{num} ms",
-    "1#1 sec|#{num} sec": "one#{num} il -biriqsi|#{num} il-biriqsi",
-    "1#1 min|#{num} min": "one#{num} daqiiqo|#{num} daqiiqo",
-    "1#1 hr|#{num} hrs": "one#{num} s|#{num} h",
-    "durationLongDays": "one#{num} maalin|#{num} maalmooyin",
-    "1#1 wk|#{num} wks": "one#{num} Sit|#{num} Usbuucyo",
-    "1#1 mon|#{num} mons": "one#{num}Bil|#{num}Bil",
-    "1#1 yr|#{num} yrs": "one#S|#{num}Sno",
-    "durationMediumMillis": "one#{num} ms|#{num} ms",
-    "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} daqiiqo|#{num} daqiiqo",
-    "durationMediumHours": "one#{num} h|#{num} S",
-    "1#1 dy|#{num} dys": "one#{num}M|#{num}M/k",
-    "durationMediumWeeks": "one#{num} Sit|#{num} U",
-    "1#1 mo|#{num} mos": "one#{num}Bil|#{num}Bil",
-    "durationMediumYears": "one#S|#{num}Sno",
-    "durationShortMillis": "one#{num} ms|#{num} ms",
-    "#{num}s": "one#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} daqiiqo|#{num} daqiiqo",
-    "#{num}h": "one#{num} h|#{num} S",
-    "#{num}d": "one#{num}M|#{num}M/k",
-    "#{num}w": "one#{num} Sit|#{num} U",
-    "durationShortMonths": "one#{num}Bil|#{num}Bil",
-    "#{num}y": "one#S|#{num}Sno",
-    "1#in 1 second|#in {num} seconds": "one#+{num} s|#+{num} s",
-    "1#in 1 minute|#in {num} minutes": "one#+{num} min|#+{num} min",
-    "1#in 1 hour|#in {num} hours": "one#+{num} h|#+{num} h",
-    "1#in 1 day|#in {num} days": "one#+{num} d|#+{num} d",
-    "1#in 1 week|#in {num} weeks": "one#+{num} w|#+{num} w",
-    "1#in 1 month|#in {num} months": "one#+{num} m|#+{num} m",
-    "1#in 1 year|#in {num} years": "one#+{num} y|#+{num} y",
-    "1#in 1 sec|#in {num} sec": "one#+{num} s|#+{num} s",
-    "1#in 1 min|#in {num} min": "one#+{num} min|#+{num} min",
-    "1#in 1 hr|#in {num} hrs": "one#+{num} h|#+{num} h",
-    "1#in 1 dy|#in {num} dys": "one#+{num} d|#+{num} d",
-    "1#in 1 wk|#in {num} wks": "one#+{num} w|#+{num} w",
-    "1#in 1 mon|#in {num} mons": "one#+{num} m|#+{num} m",
-    "1#in 1 yr|#in {num} yrs": "one#+{num} y|#+{num} y",
-    "#in {num}s": "one#+{num} s|#+{num} s",
-    "#in {num}mi": "one#+{num} min|#+{num} min",
-    "#in {num}h": "one#+{num} h|#+{num} h",
-    "#in {num}d": "one#+{num} d|#+{num} d",
-    "#in {num}w": "one#+{num} w|#+{num} w",
-    "#in {num}mo": "one#+{num} m|#+{num} m",
-    "#in {num}y": "one#+{num} y|#+{num} y",
-    "1#1 second ago|#{num} seconds ago": "one#-{num} s|#-{num} s",
-    "1#1 minute ago|#{num} minutes ago": "one#-{num} min|#-{num} min",
-    "1#1 hour ago|#{num} hours ago": "one#-{num} h|#-{num} h",
-    "1#1 day ago|#{num} days ago": "one#-{num} d|#-{num} d",
-    "1#1 week ago|#{num} weeks ago": "one#-{num} w|#-{num} w",
-    "1#1 month ago|#{num} months ago": "one#-{num} m|#-{num} m",
-    "1#1 year ago|#{num} years ago": "one#-{num} y|#-{num} y",
-    "1#1 sec ago|#{num} sec ago": "one#-{num} s|#-{num} s",
-    "1#1 min ago|#{num} min ago": "one#-{num} min|#-{num} min",
-    "1#1 hr ago|#{num} hrs ago": "one#-{num} h|#-{num} h",
-    "1#1 dy ago|#{num} dys ago": "one#-{num} d|#-{num} d",
-    "1#1 wk ago|#{num} wks ago": "one#-{num} w|#-{num} w",
-    "1#1 mon ago|#{num} mons ago": "one#-{num} m|#-{num} m",
-    "1#1 yr ago|#{num} yrs ago": "one#-{num} y|#-{num} y",
-    "#{num}s ago": "one#-{num} s|#-{num} s",
-    "#{num}mi ago": "one#-{num} min|#-{num} min",
-    "#{num}h ago": "one#-{num} h|#-{num} h",
-    "#{num}d ago": "one#-{num} d|#-{num} d",
-    "#{num}w ago": "one#-{num} w|#-{num} w",
-    "#{num}mo ago": "one#-{num} m|#-{num} m",
-    "#{num}y ago": "one#-{num} y|#-{num} y",
+    "a0": "GH",
+    "a1": "GD",
+    "G-1": "KTM",
+    "G1": "TM",
+    "1#1 millisecond|#{num} milliseconds": "one#{num} miliseken|#{num} miliseken",
+    "1#1 second|#{num} seconds": "one#{num} ilbiriqsi|#{num} ilbiriqsi",
+    "1#1 minute|#{num} minutes": "one#{num} daqiiqad|#{num} daqiiqo",
+    "1#1 hour|#{num} hours": "one#{num} saacad|#{num} saacadood",
+    "1#1 day|#{num} days": "one#{num} maalin|#{num} maalmood",
+    "1#1 week|#{num} weeks": "one#{num} toddobaad|#{num} toddobaadyo",
+    "1#1 month|#{num} months": "one#{num} bil|#{num} bilood",
+    "1#1 year|#{num} years": "one#{num} Sannad|#{num} Sannado",
+    "#{num} ms": "#{num} ms",
+    "1#1 sec|#{num} sec": "one#{num} ilbrqsi|#{num} ilbrqsi",
+    "1#1 min|#{num} min": "one#{num} dqqd|#{num} daqiiqo",
+    "1#1 hr|#{num} hrs": "one#{num} scd|#{num} scd",
+    "durationLongDays": "one#{num} mln|#{num} mln",
+    "1#1 wk|#{num} wks": "one#{num} tdbd|#{num} tdbd",
+    "1#1 mon|#{num} mons": "one#{num} bil|#{num} bil",
+    "1#1 yr|#{num} yrs": "one#snd|#{num} snd",
+    "durationMediumMillis": "one#{num}ms|#{num}ms",
+    "1#1 se|#{num} sec": "one#{num}il|#{num}il",
+    "1#1 mi|#{num} min": "one#{num}d|#{num}d",
+    "durationMediumHours": "one#{num} scd|#{num} s",
+    "1#1 dy|#{num} dys": "one#{num}m|#{num}m",
+    "durationMediumWeeks": "one#{num}t|#{num}t",
+    "1#1 mo|#{num} mos": "one#{num}b|#{num}b",
+    "durationMediumYears": "one#{num}s|#{num}s",
+    "durationShortMillis": "one#{num}ms|#{num}ms",
+    "#{num}s": "one#{num}il|#{num}il",
+    "durationShortMinutes": "one#{num}d|#{num}d",
+    "#{num}h": "one#{num} scd|#{num} s",
+    "#{num}d": "one#{num}m|#{num}m",
+    "#{num}w": "one#{num}t|#{num}t",
+    "durationShortMonths": "one#{num}b|#{num}b",
+    "#{num}y": "one#{num}s|#{num}s",
+    "1#in 1 second|#in {num} seconds": "one#{num} ilbiriqsi|#{num} ilbiriqsi",
+    "1#in 1 minute|#in {num} minutes": "one#{num} daqiiqad|#{num} daqiidadood",
+    "1#in 1 hour|#in {num} hours": "one#{num} saacad|#{num} saacadood",
+    "1#in 1 day|#in {num} days": "one#{num} maalin|#{num} maalmood",
+    "1#in 1 week|#in {num} weeks": "one#{num} toddobaad|#{num} toddobaad",
+    "1#in 1 month|#in {num} months": "one#{num} bil|#{num} bilood",
+    "1#in 1 year|#in {num} years": "one#{num} sannad|#{num} sannadood",
+    "1#in 1 sec|#in {num} sec": "one#{num} ilbiriqsi|#{num} ilbiriqsi",
+    "1#in 1 min|#in {num} min": "one#{num} daqiiqad|#{num} daqiidadood",
+    "1#in 1 hr|#in {num} hrs": "one#{num} saacad|#{num} saacadood",
+    "1#in 1 dy|#in {num} dys": "one#{num} maalin|#{num} maalmood",
+    "1#in 1 wk|#in {num} wks": "one#{num} toddobaad|#{num} toddobaad",
+    "1#in 1 mon|#in {num} mons": "one#{num} bil|#{num} bilood",
+    "1#in 1 yr|#in {num} yrs": "one#{num} sannad|#{num} sannadood",
+    "#in {num}s": "one#{num} ilbrqsi|#{num} ilbrqsi",
+    "#in {num}mi": "one#{num} dqqd|#{num} dqqd",
+    "#in {num}h": "one#{num} scd|#{num} scd",
+    "#in {num}d": "one#{num} mln|#{num} mlmd",
+    "#in {num}w": "one#{num} tdbd|#{num} tdbd",
+    "#in {num}mo": "one#{num} bil|#{num} bil",
+    "#in {num}y": "one#{num} snd|#{num} snd",
+    "1#1 second ago|#{num} seconds ago": "one#{num} ilbiriqsi kahor|#{num} ilbiriqsi kahor",
+    "1#1 minute ago|#{num} minutes ago": "one#{num} daqiiqad kahor|#{num} daqiiqadood kahor",
+    "1#1 hour ago|#{num} hours ago": "one#{num} saacad kahor|#{num} saacadood kahor",
+    "1#1 day ago|#{num} days ago": "one#{num} maalin kahor|#{num} maalmood kahor",
+    "1#1 week ago|#{num} weeks ago": "one#{num} toddobaad kahor|#{num} toddobaad kahor",
+    "1#1 month ago|#{num} months ago": "one#{num} bil kahor|#{num} bilood kahor",
+    "1#1 year ago|#{num} years ago": "one#{num} sannad kahor|#{num} sannadood kahor",
+    "1#1 sec ago|#{num} sec ago": "one#{num} ilbiriqsi kahor|#{num} ilbiriqsi kahor",
+    "1#1 min ago|#{num} min ago": "one#{num} daqiiqad kahor|#{num} daqiiqadood kahor",
+    "1#1 hr ago|#{num} hrs ago": "one#{num} saacad kahor|#{num} saacadood kahor",
+    "1#1 dy ago|#{num} dys ago": "one#{num} maalin kahor|#{num} maalmood kahor",
+    "1#1 wk ago|#{num} wks ago": "one#{num} toddobaad kahor|#{num} toddobaad kahor",
+    "1#1 mon ago|#{num} mons ago": "one#{num} bil kahor|#{num} bilood kahor",
+    "1#1 yr ago|#{num} yrs ago": "one#{num} sannad kahor|#{num} sannadood kahor",
+    "#{num}s ago": "one#{num} ilbrqsi khr|#{num} ilbrqsi khr",
+    "#{num}mi ago": "one#{num} dqqd khr|#{num} daqiiqadood kahor",
+    "#{num}h ago": "one#{num} scd khr|#{num} scd khr",
+    "#{num}d ago": "one#{num} mln khr|#{num} mlmd khr",
+    "#{num}w ago": "one#{num} tdbd khr|#{num} tdbd khr",
+    "#{num}mo ago": "one#{num} bil khr|#{num} bil khr",
+    "#{num}y ago": "one#{num} snd khr|#{num} Snd khr",
     "separatorFull": ", ",
-    "finalSeparatorFull": " iyo ",
+    "finalSeparatorFull": ", ",
     "separatorLong": ", ",
     "finalSeparatorLong": ", ",
     "separatorMedium": ", ",
diff --git a/js/data/locale/sr/Cyrl/ME/sysres.json b/js/data/locale/sr/Cyrl/ME/sysres.json
index 4f408e4756..25ddb5c925 100644
--- a/js/data/locale/sr/Cyrl/ME/sysres.json
+++ b/js/data/locale/sr/Cyrl/ME/sysres.json
@@ -1,21 +1,7 @@
 {
-    "MMM1": "јан.",
-    "MMM2": "феб.",
     "MMM3": "март",
-    "MMM4": "апр.",
-    "MMM8": "авг.",
-    "MMM9": "септ.",
-    "MMM10": "окт.",
-    "MMM11": "нов.",
-    "MMM12": "дец.",
+    "MMM9": "септ",
     "EEEE0": "недјеља",
-    "EEE0": "нед.",
-    "EEE1": "пон.",
-    "EEE2": "ут.",
     "EEEE3": "сриједа",
-    "EEE3": "ср.",
-    "EEE4": "чет.",
-    "EEE5": "пет.",
-    "EEE6": "суб.",
     "a0": "прије подне"
 }
\ No newline at end of file
diff --git a/js/data/locale/sr/Cyrl/XK/sysres.json b/js/data/locale/sr/Cyrl/XK/sysres.json
index f61040a201..21ac3afcd9 100644
--- a/js/data/locale/sr/Cyrl/XK/sysres.json
+++ b/js/data/locale/sr/Cyrl/XK/sysres.json
@@ -1,18 +1,4 @@
 {
-    "MMM1": "јан.",
-    "MMM2": "феб.",
     "MMM3": "март",
-    "MMM4": "апр.",
-    "MMM8": "авг.",
-    "MMM9": "септ.",
-    "MMM10": "окт.",
-    "MMM11": "нов.",
-    "MMM12": "дец.",
-    "EEE0": "нед.",
-    "EEE1": "пон.",
-    "EEE2": "ут.",
-    "EEE3": "ср.",
-    "EEE4": "чет.",
-    "EEE5": "пет.",
-    "EEE6": "суб."
+    "MMM9": "септ"
 }
\ No newline at end of file
diff --git a/js/data/locale/sr/Latn/ME/sysres.json b/js/data/locale/sr/Latn/ME/sysres.json
index f68d35128d..8bd72ccb14 100644
--- a/js/data/locale/sr/Latn/ME/sysres.json
+++ b/js/data/locale/sr/Latn/ME/sysres.json
@@ -1,21 +1,7 @@
 {
-    "MMM1": "jan.",
-    "MMM2": "feb.",
     "MMM3": "mart",
-    "MMM4": "apr.",
-    "MMM8": "avg.",
-    "MMM9": "sept.",
-    "MMM10": "okt.",
-    "MMM11": "nov.",
-    "MMM12": "dec.",
+    "MMM9": "sept",
     "EEEE0": "nedjelja",
-    "EEE0": "ned.",
-    "EEE1": "pon.",
-    "EEE2": "ut.",
     "EEEE3": "srijeda",
-    "EEE3": "sr.",
-    "EEE4": "čet.",
-    "EEE5": "pet.",
-    "EEE6": "sub.",
     "a0": "prije podne"
 }
\ No newline at end of file
diff --git a/js/data/locale/sr/Latn/XK/sysres.json b/js/data/locale/sr/Latn/XK/sysres.json
index aae1d43447..aca706e6f8 100644
--- a/js/data/locale/sr/Latn/XK/sysres.json
+++ b/js/data/locale/sr/Latn/XK/sysres.json
@@ -1,18 +1,4 @@
 {
-    "MMM1": "jan.",
-    "MMM2": "feb.",
     "MMM3": "mart",
-    "MMM4": "apr.",
-    "MMM8": "avg.",
-    "MMM9": "sept.",
-    "MMM10": "okt.",
-    "MMM11": "nov.",
-    "MMM12": "dec.",
-    "EEE0": "ned.",
-    "EEE1": "pon.",
-    "EEE2": "ut.",
-    "EEE3": "sr.",
-    "EEE4": "čet.",
-    "EEE5": "pet.",
-    "EEE6": "sub."
+    "MMM9": "sept"
 }
\ No newline at end of file
diff --git a/js/data/locale/sr/Latn/sysres.json b/js/data/locale/sr/Latn/sysres.json
index 8bb27ae1a2..46f5e3822d 100644
--- a/js/data/locale/sr/Latn/sysres.json
+++ b/js/data/locale/sr/Latn/sysres.json
@@ -77,6 +77,8 @@
     "E6": "s",
     "a0": "pre podne",
     "a1": "po podne",
+    "G-1": "p. n. e.",
+    "G1": "n. e.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} milisekunda|few#{num} milisekunde|#{num} milisekundi",
     "1#1 second|#{num} seconds": "one#{num} sekunda|few#{num} sekunde|#{num} sekundi",
     "1#1 minute|#{num} minutes": "one#{num} minut|few#{num} minuta|#{num} minuta",
diff --git a/js/data/locale/sr/sysres.json b/js/data/locale/sr/sysres.json
index 5bd8e1db5f..21c1c57251 100644
--- a/js/data/locale/sr/sysres.json
+++ b/js/data/locale/sr/sysres.json
@@ -77,8 +77,8 @@
     "E6": "с",
     "a0": "пре подне",
     "a1": "по подне",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "п. н. е.",
+    "G1": "н. е.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} милисекунда|few#{num} милисекунде|#{num} милисекунди",
     "1#1 second|#{num} seconds": "one#{num} секунда|few#{num} секунде|#{num} секунди",
     "1#1 minute|#{num} minutes": "one#{num} минут|few#{num} минута|#{num} минута",
diff --git a/js/data/locale/sv/FI/dateformats.json b/js/data/locale/sv/FI/dateformats.json
index 7ecb497e48..a379e186d4 100644
--- a/js/data/locale/sv/FI/dateformats.json
+++ b/js/data/locale/sv/FI/dateformats.json
@@ -6,31 +6,31 @@
                 "f": "EEEE d MMMM yyyy",
                 "l": "EEE d MMMM yyyy",
                 "m": "EE d MMM yyyy",
-                "s": "E dd-MM-yyyy"
+                "s": "E yyyy-MM-dd"
             },
             "dmy": {
                 "f": "d MMMM yyyy",
                 "l": "d MMMM yyyy",
                 "m": "d MMM yyyy",
-                "s": "dd-MM-yyyy"
+                "s": "yyyy-MM-dd"
             },
             "dmw": {
                 "f": "EEEE d MMMM",
                 "l": "EEE d MMMM",
                 "m": "EE d MMM",
-                "s": "E dd-MM"
+                "s": "E MM-dd"
             },
             "dm": {
                 "f": "d MMMM",
                 "l": "d MMMM",
                 "m": "d MMM",
-                "s": "dd-MM"
+                "s": "MM-dd"
             },
             "my": {
                 "f": "MMMM yyyy",
                 "l": "MMMM yyyy",
                 "m": "MMM yyyy",
-                "s": "MM-yyyy"
+                "s": "yyyy-MM"
             },
             "dw": {
                 "f": "EEEE d",
@@ -100,49 +100,49 @@
                 "f": "{sd} {sm} {sy} {st} – {et}",
                 "l": "{sd} {sm} {sy} {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {et}"
+                "s": "{sy}-{sm}-{sd} {st} – {et}"
             },
             "c01": {
                 "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
             },
             "c02": {
                 "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
             },
             "c03": {
                 "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "s": "{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}"
+                "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} {em} {ey}",
                 "l": "{sd} – {ed} {em} {ey}",
                 "m": "{sd} – {ed} {em} {ey}",
-                "s": "{sd} – {ed}-{em}-{ey}"
+                "s": "{sy}-{sm}-{sd} – {ed}"
             },
             "c11": {
                 "f": "{sd} {sm} – {ed} {em} {ey}",
                 "l": "{sd} {sm} – {ed} {em} {ey}",
                 "m": "{sd} {sm} – {ed} {em} {ey}",
-                "s": "{sd}-{sm} – {ed}-{em}-{ey}"
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
             },
             "c12": {
                 "f": "{sd} {sm} {sy} – {ed} {em} {ey}",
                 "l": "{sd} {sm} {sy} – {ed} {em} {ey}",
                 "m": "{sd} {sm} {sy} – {ed} {em} {ey}",
-                "s": "{sd}-{sm}-{sy} – {ed}-{em}-{ey}"
+                "s": "{sy}-{sm}-{sd} – {ey}-{em}-{ed}"
             },
             "c20": {
                 "f": "{sm} {sy} – {em} {ey}",
                 "l": "{sm} {sy} – {em} {ey}",
                 "m": "{sm} {sy} – {em} {ey}",
-                "s": "{sm}-{sy} – {em}-{ey}"
+                "s": "{sy}-{sm} – {ey}-{em}"
             },
             "c30": {
                 "f": "{sy} – {ey}",
diff --git a/js/data/locale/sw/KE/dateformats.json b/js/data/locale/sw/KE/dateformats.json
index 908be40e74..16933f813f 100644
--- a/js/data/locale/sw/KE/dateformats.json
+++ b/js/data/locale/sw/KE/dateformats.json
@@ -1,11 +1,6 @@
 {
     "gregorian": {
-        "order": {
-            "f": "{date} 'saa' {time}",
-            "l": "{date} 'saa' {time}",
-            "m": "{date}, {time}",
-            "s": "{date}, {time}"
-        },
+        "order": "{date} {time}",
         "date": {
             "dmwy": {
                 "f": "EEEE, d MMMM yyyy",
@@ -102,28 +97,28 @@
         },
         "range": {
             "c00": {
-                "f": "{sd} {sm} {sy} saa {st} – {et}",
-                "l": "{sd} {sm} {sy} saa {st} – {et}",
-                "m": "{sd} {sm} {sy}, {st} – {et}",
-                "s": "{sd}/{sm}/{sy}, {st} – {et}"
+                "f": "{sd} {sm} {sy} {st} – {et}",
+                "l": "{sd} {sm} {sy} {st} – {et}",
+                "m": "{sd} {sm} {sy} {st} – {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} {sm} {sy} saa {st} – {ed} {em} {ey} saa {et}",
-                "l": "{sd} {sm} {sy} saa {st} – {ed} {em} {ey} saa {et}",
-                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
-                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c02": {
-                "f": "{sd} {sm} {sy} saa {st} – {ed} {em} {ey} saa {et}",
-                "l": "{sd} {sm} {sy} saa {st} – {ed} {em} {ey} saa {et}",
-                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
-                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c03": {
-                "f": "{sd} {sm} {sy} saa {st} – {ed} {em} {ey} saa {et}",
-                "l": "{sd} {sm} {sy} saa {st} – {ed} {em} {ey} saa {et}",
-                "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}",
-                "s": "{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}"
+                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}"
             },
             "c10": {
                 "f": "{sd} – {ed} {em} {ey}",
diff --git a/js/data/locale/ta/dateformats.json b/js/data/locale/ta/dateformats.json
index c63d4d91e2..c3195a9fe3 100644
--- a/js/data/locale/ta/dateformats.json
+++ b/js/data/locale/ta/dateformats.json
@@ -157,4 +157,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/ta/sysres.json b/js/data/locale/ta/sysres.json
index 8da791455b..0c67f1128f 100644
--- a/js/data/locale/ta/sysres.json
+++ b/js/data/locale/ta/sysres.json
@@ -154,11 +154,11 @@
     "#{num}mo ago": "one#{num} மாத. முன்|#{num} மாத. முன்",
     "#{num}y ago": "one#{num} ஆண்டிற்கு முன்|#{num} ஆண்டுகளுக்கு முன்",
     "separatorFull": ", ",
-    "finalSeparatorFull": ", ",
+    "finalSeparatorFull": " மற்றும் ",
     "separatorLong": ", ",
-    "finalSeparatorLong": ", ",
+    "finalSeparatorLong": " மற்றும் ",
     "separatorMedium": ", ",
-    "finalSeparatorMedium": ", ",
+    "finalSeparatorMedium": " மற்றும் ",
     "separatorShort": " ",
     "finalSeparatorShort": " "
 }
\ No newline at end of file
diff --git a/js/data/locale/te/dateformats.json b/js/data/locale/te/dateformats.json
index 1ca1c3abcb..4c9f0c134b 100644
--- a/js/data/locale/te/dateformats.json
+++ b/js/data/locale/te/dateformats.json
@@ -157,4 +157,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/tg/sysres.json b/js/data/locale/tg/sysres.json
index d7b44856a3..da4b959049 100644
--- a/js/data/locale/tg/sysres.json
+++ b/js/data/locale/tg/sysres.json
@@ -75,8 +75,8 @@
     "EEE6": "Шнб",
     "EE6": "Шнб",
     "E6": "Ш",
-    "a0": "пе. чо.",
-    "a1": "па. чо.",
+    "a0": "AM",
+    "a1": "PM",
     "G-1": "BCE",
     "G1": "CE",
     "1#1 millisecond|#{num} milliseconds": "#{num} ms",
diff --git a/js/data/locale/tt/sysres.json b/js/data/locale/tt/sysres.json
index 18186c5a83..6c1443ef2f 100644
--- a/js/data/locale/tt/sysres.json
+++ b/js/data/locale/tt/sysres.json
@@ -77,8 +77,8 @@
     "E6": "Ш",
     "a0": "AM",
     "a1": "PM",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "б.э.к.",
+    "G1": "б.э.",
     "1#1 millisecond|#{num} milliseconds": "#{num} ms",
     "1#1 second|#{num} seconds": "#{num} s",
     "1#1 minute|#{num} minutes": "#{num} min",
diff --git a/js/data/locale/uk/sysres.json b/js/data/locale/uk/sysres.json
index f329cdf396..5e6a6cdbde 100644
--- a/js/data/locale/uk/sysres.json
+++ b/js/data/locale/uk/sysres.json
@@ -153,8 +153,8 @@
     "c6": "С",
     "a0": "дп",
     "a1": "пп",
-    "G-1": "BCE",
-    "G1": "CE",
+    "G-1": "до н. е.",
+    "G1": "н. е.",
     "1#1 millisecond|#{num} milliseconds": "one#{num} мілісекунда|few#{num} мілісекунди|many#{num} мілісекунд|#{num} мілісекунди",
     "1#1 second|#{num} seconds": "one#{num} секунда|few#{num} секунди|many#{num} секунд|#{num} секунди",
     "1#1 minute|#{num} minutes": "one#{num} хвилина|few#{num} хвилини|many#{num} хвилин|#{num} хвилини",
@@ -232,9 +232,9 @@
     "separatorFull": ", ",
     "finalSeparatorFull": " і ",
     "separatorLong": ", ",
-    "finalSeparatorLong": ", ",
+    "finalSeparatorLong": " і ",
     "separatorMedium": ", ",
-    "finalSeparatorMedium": ", ",
+    "finalSeparatorMedium": " і ",
     "separatorShort": ", ",
-    "finalSeparatorShort": ", "
+    "finalSeparatorShort": " і "
 }
\ No newline at end of file
diff --git a/js/data/locale/ur/sysres.json b/js/data/locale/ur/sysres.json
index f410a5a4bd..0fe5118372 100644
--- a/js/data/locale/ur/sysres.json
+++ b/js/data/locale/ur/sysres.json
@@ -149,7 +149,7 @@
     "#{num}s ago": "one#‏{num} سیکنڈ پہلے|#‏{num} سیکنڈ پہلے",
     "#{num}mi ago": "one#‏{num} منٹ پہلے|#‏{num} منٹ پہلے",
     "#{num}h ago": "one#‏{num} گھنٹے پہلے|#‏{num} گھنٹے پہلے",
-    "#{num}d ago": "one#‏{num} دن پہلے|#‏{num} دنوں پہلے",
+    "#{num}d ago": "one#‏{num} دن پہلے|#‏{num} دن پہلے",
     "#{num}w ago": "one#‏{num} ہفتے پہلے|#‏{num} ہفتے پہلے",
     "#{num}mo ago": "one#‏{num} ماہ قبل|#‏{num} ماہ قبل",
     "#{num}y ago": "one#‏{num} سال پہلے|#‏{num} سال پہلے",
diff --git a/js/data/locale/uz/Cyrl/sysres.json b/js/data/locale/uz/Cyrl/sysres.json
index 3e7c72944c..1530194f0d 100644
--- a/js/data/locale/uz/Cyrl/sysres.json
+++ b/js/data/locale/uz/Cyrl/sysres.json
@@ -237,4 +237,4 @@
     "finalSeparatorMedium": ", ",
     "separatorShort": ", ",
     "finalSeparatorShort": ", "
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/vi/dateformats.json b/js/data/locale/vi/dateformats.json
index fee3bd3afe..157e2a6724 100644
--- a/js/data/locale/vi/dateformats.json
+++ b/js/data/locale/vi/dateformats.json
@@ -169,4 +169,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/vi/sysres.json b/js/data/locale/vi/sysres.json
index ae13218b49..111f001e51 100644
--- a/js/data/locale/vi/sysres.json
+++ b/js/data/locale/vi/sysres.json
@@ -1,52 +1,52 @@
 {
     "MMMM1": "tháng 1",
     "MMM1": "thg 1",
-    "NN1": "th 1",
-    "N1": "t 1",
+    "NN1": "th1",
+    "N1": "t1",
     "MMMM2": "tháng 2",
     "MMM2": "thg 2",
-    "NN2": "th 2",
-    "N2": "t 2",
+    "NN2": "th2",
+    "N2": "t2",
     "MMMM3": "tháng 3",
     "MMM3": "thg 3",
-    "NN3": "th 3",
-    "N3": "t 3",
+    "NN3": "th3",
+    "N3": "t3",
     "MMMM4": "tháng 4",
     "MMM4": "thg 4",
-    "NN4": "th 4",
-    "N4": "t 4",
+    "NN4": "th4",
+    "N4": "t4",
     "MMMM5": "tháng 5",
     "MMM5": "thg 5",
-    "NN5": "th 5",
-    "N5": "t 5",
+    "NN5": "th5",
+    "N5": "t5",
     "MMMM6": "tháng 6",
     "MMM6": "thg 6",
-    "NN6": "th 6",
-    "N6": "t 6",
+    "NN6": "th6",
+    "N6": "t6",
     "MMMM7": "tháng 7",
     "MMM7": "thg 7",
-    "NN7": "th 7",
-    "N7": "t 7",
+    "NN7": "th7",
+    "N7": "t7",
     "MMMM8": "tháng 8",
     "MMM8": "thg 8",
-    "NN8": "th 8",
-    "N8": "t 8",
+    "NN8": "th8",
+    "N8": "t8",
     "MMMM9": "tháng 9",
     "MMM9": "thg 9",
-    "NN9": "th 9",
-    "N9": "t 9",
+    "NN9": "th9",
+    "N9": "t9",
     "MMMM10": "tháng 10",
     "MMM10": "thg 10",
-    "NN10": "th 10",
-    "N10": "t 10",
+    "NN10": "th10",
+    "N10": "t10",
     "MMMM11": "tháng 11",
     "MMM11": "thg 11",
-    "NN11": "th 11",
-    "N11": "t 11",
+    "NN11": "th11",
+    "N11": "t11",
     "MMMM12": "tháng 12",
     "MMM12": "thg 12",
-    "NN12": "th 12",
-    "N12": "t 12",
+    "NN12": "th12",
+    "N12": "t12",
     "LLLL1": "Tháng 1",
     "LLL1": "Thg 1",
     "LL1": "Th 1",
@@ -230,11 +230,11 @@
     "#{num}mo ago": "#{num} tháng trước",
     "#{num}y ago": "#{num} năm trước",
     "separatorFull": ", ",
-    "finalSeparatorFull": ", ",
+    "finalSeparatorFull": " và ",
     "separatorLong": ", ",
-    "finalSeparatorLong": ", ",
+    "finalSeparatorLong": " và ",
     "separatorMedium": ", ",
-    "finalSeparatorMedium": ", ",
+    "finalSeparatorMedium": " và ",
     "separatorShort": " ",
     "finalSeparatorShort": " "
-}
+}
\ No newline at end of file
diff --git a/js/data/locale/yo/BJ/dateformats.json b/js/data/locale/yo/BJ/dateformats.json
index 16933f813f..c1a957af51 100644
--- a/js/data/locale/yo/BJ/dateformats.json
+++ b/js/data/locale/yo/BJ/dateformats.json
@@ -3,40 +3,40 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "EEEE, d MMMM yyyy",
-                "l": "EEE, d MMMM yyyy",
-                "m": "EE, d MMM yyyy",
-                "s": "E, dd/MM/yyyy"
+                "f": "EEEE, d MMM yyyy",
+                "l": "EEE, d MMM yyyy",
+                "m": "EE, d MM yyyy",
+                "s": "E, d/M/yyyy"
             },
             "dmy": {
-                "f": "d MMMM yyyy",
-                "l": "d MMMM yyyy",
-                "m": "d MMM yyyy",
-                "s": "dd/MM/yyyy"
+                "f": "d MMM yyyy",
+                "l": "d MMM yyyy",
+                "m": "d MM yyyy",
+                "s": "d/M/yyyy"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, d MMM",
-                "s": "E, dd/MM"
+                "f": "EEEE, d MMM",
+                "l": "EEE, d MMM",
+                "m": "EE, d MM",
+                "s": "E, d/M"
             },
             "dm": {
-                "f": "d MMMM",
-                "l": "d MMMM",
-                "m": "d MMM",
-                "s": "dd/MM"
+                "f": "d MMM",
+                "l": "d MMM",
+                "m": "d MM",
+                "s": "d/M"
             },
             "my": {
-                "f": "MMMM yyyy",
-                "l": "MMMM yyyy",
-                "m": "MMM yyyy",
-                "s": "MM/yyyy"
+                "f": "LLL yyyy",
+                "l": "LLL yyyy",
+                "m": "MM yyyy",
+                "s": "M/yyyy"
             },
             "dw": {
                 "f": "EEEE, d",
                 "l": "EEE, d",
                 "m": "EE, d",
-                "s": "E, dd"
+                "s": "E, d"
             },
             "w": {
                 "f": "EEEE",
@@ -48,19 +48,31 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "dd"
+                "s": "d"
             },
             "m": {
-                "f": "MMMM",
-                "l": "MMMM",
-                "m": "MMM",
-                "s": "MM"
+                "f": "MMM",
+                "l": "MMM",
+                "m": "MM",
+                "s": "M"
             },
             "y": {
                 "f": "yyyy",
                 "l": "yyyy",
                 "m": "yyyy",
                 "s": "yyyy"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLL",
+                "l": "LLL",
+                "m": "LL",
+                "s": "L"
             }
         },
         "time": {
@@ -69,30 +81,30 @@
                 "m": "mm",
                 "s": "ss",
                 "ah": "h a",
-                "hm": "h:mm",
-                "ms": "mm:ss",
-                "ahm": "h:mm a",
-                "hms": "h:mm:ss",
-                "hmz": "h:mm z",
-                "ahmz": "h:mm a z",
-                "ahms": "h:mm:ss a",
-                "hmsz": "h:mm:ss z",
-                "ahmsz": "h:mm:ss a z"
+                "hm": "h:m",
+                "ms": "m:s",
+                "ahm": "h:m a",
+                "hms": "h:m:s",
+                "hmz": "h:m z",
+                "ahmz": "h:m a z",
+                "ahms": "h:m:s a",
+                "hmsz": "h:m:s z",
+                "ahmsz": "h:m:s a z"
             },
             "24": {
-                "h": "HH",
+                "h": "H",
                 "m": "mm",
                 "s": "ss",
-                "ah": "HH",
-                "hm": "HH:mm",
-                "ms": "mm:ss",
-                "ahm": "HH:mm",
-                "hms": "HH:mm:ss",
-                "hmz": "HH:mm z",
-                "ahmz": "HH:mm z",
-                "ahms": "HH:mm:ss",
-                "hmsz": "HH:mm:ss z",
-                "ahmsz": "HH:mm:ss z"
+                "ah": "H",
+                "hm": "H:m",
+                "ms": "m:s",
+                "ahm": "H:m",
+                "hms": "H:m:s",
+                "hmz": "H:m z",
+                "ahmz": "H:m z",
+                "ahms": "H:m:s",
+                "hmsz": "H:m:s z",
+                "ahmsz": "H:m:s z"
             }
         },
         "range": {
diff --git a/js/data/locale/yo/BJ/sysres.json b/js/data/locale/yo/BJ/sysres.json
index 602e82a4d9..0e3b135590 100644
--- a/js/data/locale/yo/BJ/sysres.json
+++ b/js/data/locale/yo/BJ/sysres.json
@@ -1,49 +1,112 @@
 {
     "MMMM1": "Oshù Shɛ́rɛ́",
-    "MMM1": "Shɛ́rɛ́",
+    "MMM1": "Shɛ́r",
     "NN1": "Sh",
     "N1": "S",
     "MMMM2": "Oshù Èrèlè",
     "MMMM3": "Oshù Ɛrɛ̀nà",
-    "MMM3": "Ɛrɛ̀nà",
+    "MMM3": "Ɛrɛ̀n",
     "NN3": "Ɛr",
     "N3": "Ɛ",
     "MMMM4": "Oshù Ìgbé",
     "MMMM5": "Oshù Ɛ̀bibi",
-    "MMM5": "Ɛ̀bibi",
+    "MMM5": "Ɛ̀bi",
     "NN5": "Ɛ̀",
     "N5": "Ɛ",
     "MMMM6": "Oshù Òkúdu",
     "MMMM7": "Oshù Agɛmɔ",
-    "MMM7": "Agɛmɔ",
+    "MMM7": "Agɛ",
     "MMMM8": "Oshù Ògún",
     "MMMM9": "Oshù Owewe",
     "MMMM10": "Oshù Ɔ̀wàrà",
-    "MMM10": "Ɔ̀wàrà",
+    "MMM10": "Ɔ̀wà",
     "NN10": "Ɔ̀",
     "N10": "Ɔ",
     "MMMM11": "Oshù Bélú",
     "MMMM12": "Oshù Ɔ̀pɛ̀",
-    "MMM12": "Ɔ̀pɛ̀",
+    "MMM12": "Ɔ̀pɛ",
     "NN12": "Ɔ̀",
     "N12": "Ɔ",
+    "LLLL1": "Shɛ́rɛ́",
+    "LLL1": "Shɛ́",
+    "LL1": "Sh",
+    "LLLL3": "Ɛrɛ̀nà",
+    "LLL3": "Ɛr",
+    "LL3": "Ɛr",
+    "L3": "Ɛ",
+    "LLLL5": "Ɛ̀bibi",
+    "LLL5": "Ɛ̀b",
+    "LL5": "Ɛ̀",
+    "L5": "Ɛ̀",
+    "LLLL7": "Agɛmɔ",
+    "LLLL10": "Ɔ̀wàrà",
+    "LLL10": "Ɔ̀w",
+    "LL10": "Ɔ̀",
+    "L10": "Ɔ̀",
+    "LLLL12": "Ɔ̀pɛ̀",
+    "LLL12": "Ɔ̀p",
+    "LL12": "Ɔ̀",
+    "L12": "Ɔ̀",
     "EEEE0": "Ɔjɔ́ Àìkú",
     "EEEE1": "Ɔjɔ́ Ajé",
     "EEEE2": "Ɔjɔ́ Ìsɛ́gun",
-    "EEE2": "Ìsɛ́gun",
+    "EEE2": "Ìsɛ́g",
     "EE2": "Ìsɛ́gun",
     "EEEE3": "Ɔjɔ́rú",
-    "EEE3": "Ɔjɔ́rú",
+    "EEE3": "Ɔjɔ́r",
     "EE3": "Ɔjɔ́rú",
+    "E3": "Ɔ",
     "EEEE4": "Ɔjɔ́bɔ",
-    "EEE4": "Ɔjɔ́bɔ",
+    "EEE4": "Ɔjɔ́b",
     "EE4": "Ɔjɔ́bɔ",
+    "E4": "Ɔ",
     "EEEE5": "Ɔjɔ́ Ɛtì",
-    "EEE5": "Ɛtì",
+    "EEE5": "Ɛt",
     "EE5": "Ɛtì",
+    "E5": "Ɛ",
     "EEEE6": "Ɔjɔ́ Àbámɛ́ta",
-    "EEE6": "Àbámɛ́ta",
     "EE6": "Àbámɛ́ta",
+    "cccc2": "Ìsɛ́gun",
+    "ccc2": "Ìsɛ́g",
+    "cc2": "Ìsɛ́gun",
+    "cccc3": "Ɔjɔ́rú",
+    "ccc3": "Ɔjɔ́r",
+    "cc3": "Ɔjɔ́rú",
+    "c3": "Ɔ",
+    "cccc4": "Ɔjɔ́bɔ",
+    "ccc4": "Ɔjɔ́b",
+    "cc4": "Ɔjɔ́bɔ",
+    "c4": "Ɔ",
+    "cccc5": "Ɛtì",
+    "ccc5": "Ɛt",
+    "cc5": "Ɛtì",
+    "c5": "Ɛ",
+    "cccc6": "Àbámɛ́ta",
+    "cc6": "Àbámɛ́ta",
     "a0": "Àárɔ̀",
-    "a1": "Ɔ̀sán"
+    "a1": "Ɔ̀sán",
+    "1#1 second|#{num} seconds": "#{num}ìsh àáy",
+    "1#1 minute|#{num} minutes": "#{num} ìsh",
+    "1#1 day|#{num} days": "#ɔj {num}",
+    "1#1 week|#{num} weeks": "#{num} ɔsh",
+    "1#1 month|#{num} months": "#{num} oshù",
+    "1#1 year|#{num} years": "#{num} ɔd",
+    "1#1 sec|#{num} sec": "#{num} ìsh àáy",
+    "1#1 min|#{num} min": "#{num} ìsh",
+    "durationLongDays": "#{num} ɔj",
+    "1#1 wk|#{num} wks": "#{num} ɔsh",
+    "1#1 mon|#{num} mons": "#{num} oshù",
+    "1#1 yr|#{num} yrs": "#{num} ɔd",
+    "1#1 se|#{num} sec": "#{num} ìsh àáy",
+    "1#1 mi|#{num} min": "#{num}/ìsh",
+    "1#1 dy|#{num} dys": "#ɔj {num}",
+    "durationMediumWeeks": "#{num} ɔsh",
+    "1#1 mo|#{num} mos": "#{num} oshù",
+    "durationMediumYears": "#{num} ɔd",
+    "#{num}s": "#{num} ìsh àáy",
+    "durationShortMinutes": "#{num}/ìsh",
+    "#{num}d": "#ɔj {num}",
+    "#{num}w": "#{num} ɔsh",
+    "durationShortMonths": "#{num} oshù",
+    "#{num}y": "#{num} ɔd"
 }
\ No newline at end of file
diff --git a/js/data/locale/yo/dateformats.json b/js/data/locale/yo/dateformats.json
index 16933f813f..c1a957af51 100644
--- a/js/data/locale/yo/dateformats.json
+++ b/js/data/locale/yo/dateformats.json
@@ -3,40 +3,40 @@
         "order": "{date} {time}",
         "date": {
             "dmwy": {
-                "f": "EEEE, d MMMM yyyy",
-                "l": "EEE, d MMMM yyyy",
-                "m": "EE, d MMM yyyy",
-                "s": "E, dd/MM/yyyy"
+                "f": "EEEE, d MMM yyyy",
+                "l": "EEE, d MMM yyyy",
+                "m": "EE, d MM yyyy",
+                "s": "E, d/M/yyyy"
             },
             "dmy": {
-                "f": "d MMMM yyyy",
-                "l": "d MMMM yyyy",
-                "m": "d MMM yyyy",
-                "s": "dd/MM/yyyy"
+                "f": "d MMM yyyy",
+                "l": "d MMM yyyy",
+                "m": "d MM yyyy",
+                "s": "d/M/yyyy"
             },
             "dmw": {
-                "f": "EEEE, d MMMM",
-                "l": "EEE, d MMMM",
-                "m": "EE, d MMM",
-                "s": "E, dd/MM"
+                "f": "EEEE, d MMM",
+                "l": "EEE, d MMM",
+                "m": "EE, d MM",
+                "s": "E, d/M"
             },
             "dm": {
-                "f": "d MMMM",
-                "l": "d MMMM",
-                "m": "d MMM",
-                "s": "dd/MM"
+                "f": "d MMM",
+                "l": "d MMM",
+                "m": "d MM",
+                "s": "d/M"
             },
             "my": {
-                "f": "MMMM yyyy",
-                "l": "MMMM yyyy",
-                "m": "MMM yyyy",
-                "s": "MM/yyyy"
+                "f": "LLL yyyy",
+                "l": "LLL yyyy",
+                "m": "MM yyyy",
+                "s": "M/yyyy"
             },
             "dw": {
                 "f": "EEEE, d",
                 "l": "EEE, d",
                 "m": "EE, d",
-                "s": "E, dd"
+                "s": "E, d"
             },
             "w": {
                 "f": "EEEE",
@@ -48,19 +48,31 @@
                 "f": "d",
                 "l": "d",
                 "m": "d",
-                "s": "dd"
+                "s": "d"
             },
             "m": {
-                "f": "MMMM",
-                "l": "MMMM",
-                "m": "MMM",
-                "s": "MM"
+                "f": "MMM",
+                "l": "MMM",
+                "m": "MM",
+                "s": "M"
             },
             "y": {
                 "f": "yyyy",
                 "l": "yyyy",
                 "m": "yyyy",
                 "s": "yyyy"
+            },
+            "e": {
+                "f": "cccc",
+                "l": "ccc",
+                "m": "cc",
+                "s": "c"
+            },
+            "l": {
+                "f": "LLL",
+                "l": "LLL",
+                "m": "LL",
+                "s": "L"
             }
         },
         "time": {
@@ -69,30 +81,30 @@
                 "m": "mm",
                 "s": "ss",
                 "ah": "h a",
-                "hm": "h:mm",
-                "ms": "mm:ss",
-                "ahm": "h:mm a",
-                "hms": "h:mm:ss",
-                "hmz": "h:mm z",
-                "ahmz": "h:mm a z",
-                "ahms": "h:mm:ss a",
-                "hmsz": "h:mm:ss z",
-                "ahmsz": "h:mm:ss a z"
+                "hm": "h:m",
+                "ms": "m:s",
+                "ahm": "h:m a",
+                "hms": "h:m:s",
+                "hmz": "h:m z",
+                "ahmz": "h:m a z",
+                "ahms": "h:m:s a",
+                "hmsz": "h:m:s z",
+                "ahmsz": "h:m:s a z"
             },
             "24": {
-                "h": "HH",
+                "h": "H",
                 "m": "mm",
                 "s": "ss",
-                "ah": "HH",
-                "hm": "HH:mm",
-                "ms": "mm:ss",
-                "ahm": "HH:mm",
-                "hms": "HH:mm:ss",
-                "hmz": "HH:mm z",
-                "ahmz": "HH:mm z",
-                "ahms": "HH:mm:ss",
-                "hmsz": "HH:mm:ss z",
-                "ahmsz": "HH:mm:ss z"
+                "ah": "H",
+                "hm": "H:m",
+                "ms": "m:s",
+                "ahm": "H:m",
+                "hms": "H:m:s",
+                "hmz": "H:m z",
+                "ahmz": "H:m z",
+                "ahms": "H:m:s",
+                "hmsz": "H:m:s z",
+                "ahmsz": "H:m:s z"
             }
         },
         "range": {
diff --git a/js/data/locale/yo/sysres.json b/js/data/locale/yo/sysres.json
index b3d6668f87..40e23c031f 100644
--- a/js/data/locale/yo/sysres.json
+++ b/js/data/locale/yo/sysres.json
@@ -1,116 +1,192 @@
 {
     "MMMM1": "Oṣù Ṣẹ́rẹ́",
-    "MMM1": "Ṣẹ́rẹ́",
+    "MMM1": "Ṣẹ́r",
     "NN1": "Ṣẹ",
     "N1": "Ṣ",
     "MMMM2": "Oṣù Èrèlè",
-    "MMM2": "Èrèlè",
+    "MMM2": "Èrèl",
     "NN2": "Èr",
     "N2": "È",
     "MMMM3": "Oṣù Ẹrẹ̀nà",
-    "MMM3": "Ẹrẹ̀nà",
+    "MMM3": "Ẹrẹ̀n",
     "NN3": "Ẹr",
     "N3": "Ẹ",
     "MMMM4": "Oṣù Ìgbé",
-    "MMM4": "Ìgbé",
+    "MMM4": "Ìgb",
     "NN4": "Ìg",
     "N4": "Ì",
     "MMMM5": "Oṣù Ẹ̀bibi",
-    "MMM5": "Ẹ̀bibi",
+    "MMM5": "Ẹ̀bi",
     "NN5": "Ẹ̀",
     "N5": "Ẹ",
     "MMMM6": "Oṣù Òkúdu",
-    "MMM6": "Òkúdu",
+    "MMM6": "Òkú",
     "NN6": "Òk",
     "N6": "Ò",
     "MMMM7": "Oṣù Agẹmọ",
-    "MMM7": "Agẹmọ",
+    "MMM7": "Agẹ",
     "NN7": "Ag",
     "N7": "A",
     "MMMM8": "Oṣù Ògún",
-    "MMM8": "Ògún",
+    "MMM8": "Ògú",
     "NN8": "Òg",
     "N8": "Ò",
     "MMMM9": "Oṣù Owewe",
-    "MMM9": "Owewe",
+    "MMM9": "Owe",
     "NN9": "Ow",
     "N9": "O",
     "MMMM10": "Oṣù Ọ̀wàrà",
-    "MMM10": "Ọ̀wàrà",
+    "MMM10": "Ọ̀wà",
     "NN10": "Ọ̀",
     "N10": "Ọ",
     "MMMM11": "Oṣù Bélú",
-    "MMM11": "Bélú",
+    "MMM11": "Bél",
     "NN11": "Bé",
     "N11": "B",
     "MMMM12": "Oṣù Ọ̀pẹ̀",
-    "MMM12": "Ọ̀pẹ̀",
+    "MMM12": "Ọ̀pẹ",
     "NN12": "Ọ̀",
     "N12": "Ọ",
+    "LLLL1": "Ṣẹ́rẹ́",
+    "LLL1": "Ṣẹ́",
+    "LL1": "Ṣẹ",
+    "L1": "S",
+    "LLLL2": "Èrèlè",
+    "LLL2": "Èr",
+    "LL2": "Èr",
+    "L2": "È",
+    "LLLL3": "Ẹrẹ̀nà",
+    "LLL3": "Ẹr",
+    "LL3": "Ẹr",
+    "L3": "Ẹ",
+    "LLLL4": "Ìgbé",
+    "LLL4": "Ìg",
+    "LL4": "Ìg",
+    "L4": "Ì",
+    "LLLL5": "Ẹ̀bibi",
+    "LLL5": "Ẹ̀b",
+    "LL5": "Ẹ̀",
+    "L5": "Ẹ̀",
+    "LLLL6": "Òkúdu",
+    "LLL6": "Òk",
+    "LL6": "Òk",
+    "L6": "Ò",
+    "LLLL7": "Agẹmọ",
+    "LLL7": "Ag",
+    "LL7": "Ag",
+    "L7": "A",
+    "LLLL8": "Ògún",
+    "LLL8": "Òg",
+    "LL8": "Òg",
+    "L8": "Ò",
+    "LLLL9": "Owewe",
+    "LLL9": "Ow",
+    "LL9": "Ow",
+    "L9": "O",
+    "LLLL10": "Ọ̀wàrà",
+    "LLL10": "Ọ̀w",
+    "LL10": "Ọ̀",
+    "L10": "Ọ̀",
+    "LLLL11": "Bélú",
+    "LLL11": "Bé",
+    "LL11": "Bé",
+    "L11": "B",
+    "LLLL12": "Ọ̀pẹ̀",
+    "LLL12": "Ọ̀p",
+    "LL12": "Ọ̀",
+    "L12": "Ọ̀",
     "EEEE0": "Ọjọ́ Àìkú",
-    "EEE0": "Àìkú",
+    "EEE0": "Àìk",
     "EE0": "Àìkú",
-    "E0": "S",
+    "E0": "À",
     "EEEE1": "Ọjọ́ Ajé",
-    "EEE1": "Ajé",
+    "EEE1": "Aj",
     "EE1": "Ajé",
-    "E1": "M",
+    "E1": "A",
     "EEEE2": "Ọjọ́ Ìsẹ́gun",
-    "EEE2": "Ìsẹ́gun",
+    "EEE2": "Ìsẹ́g",
     "EE2": "Ìsẹ́gun",
-    "E2": "T",
+    "E2": "Ì",
     "EEEE3": "Ọjọ́rú",
-    "EEE3": "Ọjọ́rú",
+    "EEE3": "Ọjọ́r",
     "EE3": "Ọjọ́rú",
-    "E3": "W",
+    "E3": "Ọ",
     "EEEE4": "Ọjọ́bọ",
-    "EEE4": "Ọjọ́bọ",
+    "EEE4": "Ọjọ́b",
     "EE4": "Ọjọ́bọ",
-    "E4": "T",
+    "E4": "Ọ",
     "EEEE5": "Ọjọ́ Ẹtì",
-    "EEE5": "Ẹtì",
+    "EEE5": "Ẹt",
     "EE5": "Ẹtì",
-    "E5": "F",
+    "E5": "Ẹ",
     "EEEE6": "Ọjọ́ Àbámẹ́ta",
-    "EEE6": "Àbámẹ́ta",
+    "EEE6": "Àbám",
     "EE6": "Àbámẹ́ta",
-    "E6": "S",
+    "E6": "À",
+    "cccc0": "Àìkú",
+    "ccc0": "Àìk",
+    "cc0": "Àìkú",
+    "c0": "À",
+    "cccc1": "Ajé",
+    "ccc1": "Aj",
+    "cc1": "Ajé",
+    "c1": "A",
+    "cccc2": "Ìsẹ́gun",
+    "ccc2": "Ìsẹ́g",
+    "cc2": "Ìsẹ́gun",
+    "c2": "Ì",
+    "cccc3": "Ọjọ́rú",
+    "ccc3": "Ọjọ́r",
+    "cc3": "Ọjọ́rú",
+    "c3": "Ọ",
+    "cccc4": "Ọjọ́bọ",
+    "ccc4": "Ọjọ́b",
+    "cc4": "Ọjọ́bọ",
+    "c4": "Ọ",
+    "cccc5": "Ẹtì",
+    "ccc5": "Ẹt",
+    "cc5": "Ẹtì",
+    "c5": "Ẹ",
+    "cccc6": "Àbámẹ́ta",
+    "ccc6": "Àbám",
+    "cc6": "Àbámẹ́ta",
+    "c6": "À",
     "a0": "Àárọ̀",
     "a1": "Ọ̀sán",
     "G-1": "BCE",
     "G1": "CE",
     "1#1 millisecond|#{num} milliseconds": "#{num} ms",
-    "1#1 second|#{num} seconds": "#{num} s",
-    "1#1 minute|#{num} minutes": "#{num} min",
-    "1#1 hour|#{num} hours": "#{num} h",
-    "1#1 day|#{num} days": "#{num} d",
-    "1#1 week|#{num} weeks": "#{num} w",
-    "1#1 month|#{num} months": "#{num} m",
-    "1#1 year|#{num} years": "#{num} y",
+    "1#1 second|#{num} seconds": "#{num}ìṣ àáy",
+    "1#1 minute|#{num} minutes": "#{num} ìṣ",
+    "1#1 hour|#{num} hours": "#{num} wkt",
+    "1#1 day|#{num} days": "#ọj {num}",
+    "1#1 week|#{num} weeks": "#{num} ọṣ",
+    "1#1 month|#{num} months": "#{num} oṣù",
+    "1#1 year|#{num} years": "#{num} ọd",
     "#{num} ms": "#{num} ms",
-    "1#1 sec|#{num} sec": "#{num} s",
-    "1#1 min|#{num} min": "#{num} min",
-    "1#1 hr|#{num} hrs": "#{num} h",
-    "durationLongDays": "#{num} d",
-    "1#1 wk|#{num} wks": "#{num} w",
-    "1#1 mon|#{num} mons": "#{num} m",
-    "1#1 yr|#{num} yrs": "#{num} y",
+    "1#1 sec|#{num} sec": "#{num} ìṣ àáy",
+    "1#1 min|#{num} min": "#{num} ìṣ",
+    "1#1 hr|#{num} hrs": "#{num} wkt",
+    "durationLongDays": "#{num} ọj",
+    "1#1 wk|#{num} wks": "#{num} ọṣ",
+    "1#1 mon|#{num} mons": "#{num} oṣù",
+    "1#1 yr|#{num} yrs": "#{num} ọd",
     "durationMediumMillis": "#{num} ms",
-    "1#1 se|#{num} sec": "#{num} s",
-    "1#1 mi|#{num} min": "#{num} min",
-    "durationMediumHours": "#{num} h",
-    "1#1 dy|#{num} dys": "#{num} d",
-    "durationMediumWeeks": "#{num} w",
-    "1#1 mo|#{num} mos": "#{num} m",
-    "durationMediumYears": "#{num} y",
+    "1#1 se|#{num} sec": "#{num} ìṣ àáy",
+    "1#1 mi|#{num} min": "#{num}/ìṣ",
+    "durationMediumHours": "#{num} wkt",
+    "1#1 dy|#{num} dys": "#ọj {num}",
+    "durationMediumWeeks": "#{num} ọṣ",
+    "1#1 mo|#{num} mos": "#{num} oṣù",
+    "durationMediumYears": "#{num} ọd",
     "durationShortMillis": "#{num} ms",
-    "#{num}s": "#{num} s",
-    "durationShortMinutes": "#{num} min",
-    "#{num}h": "#{num} h",
-    "#{num}d": "#{num} d",
-    "#{num}w": "#{num} w",
-    "durationShortMonths": "#{num} m",
-    "#{num}y": "#{num} y",
+    "#{num}s": "#{num} ìṣ àáy",
+    "durationShortMinutes": "#{num}/ìṣ",
+    "#{num}h": "#{num} wkt",
+    "#{num}d": "#ọj {num}",
+    "#{num}w": "#{num} ọṣ",
+    "durationShortMonths": "#{num} oṣù",
+    "#{num}y": "#{num} ọd",
     "1#in 1 second|#in {num} seconds": "#+{num} s",
     "1#in 1 minute|#in {num} minutes": "#+{num} min",
     "1#in 1 hour|#in {num} hours": "#+{num} h",
diff --git a/js/data/locale/yue/sysres.json b/js/data/locale/yue/sysres.json
index 6de2f6a73a..486dee3372 100644
--- a/js/data/locale/yue/sysres.json
+++ b/js/data/locale/yue/sysres.json
@@ -158,5 +158,7 @@
     "separatorLong": " ",
     "finalSeparatorLong": " ",
     "separatorMedium": " ",
-    "finalSeparatorMedium": " "
+    "finalSeparatorMedium": " ",
+    "separatorShort": "",
+    "finalSeparatorShort": ""
 }
\ No newline at end of file
diff --git a/js/data/locale/zh/sysres.json b/js/data/locale/zh/sysres.json
index 90ebfd0128..dba9327430 100644
--- a/js/data/locale/zh/sysres.json
+++ b/js/data/locale/zh/sysres.json
@@ -79,14 +79,6 @@
     "a1": "下午",
     "G-1": "BCE",
     "G1": "CE",
-    "azh0": "凌晨",
-    "azh1": "早上",
-    "azh2": "上午",
-    "azh3": "正午",
-    "azh4": "下午",
-    "azh5": "傍晚",
-    "azh6": "晚上",
-    "ordinalChoice": "#{num}天",
     "1#1 millisecond|#{num} milliseconds": "#{num}毫秒",
     "1#1 second|#{num} seconds": "#{num}秒钟",
     "1#1 minute|#{num} minutes": "#{num}分钟",
@@ -168,5 +160,13 @@
     "separatorMedium": "",
     "finalSeparatorMedium": "",
     "separatorShort": "",
-    "finalSeparatorShort": ""
-}
+    "finalSeparatorShort": "",
+    "azh0": "凌晨",
+    "azh1": "早上",
+    "azh2": "上午",
+    "azh3": "正午",
+    "azh4": "下午",
+    "azh5": "傍晚",
+    "azh6": "晚上",
+    "ordinalChoice": "#{num}天"
+}
\ No newline at end of file
diff --git a/js/data/locale/zu/dateformats.json b/js/data/locale/zu/dateformats.json
index 3c6557216f..5236af7871 100644
--- a/js/data/locale/zu/dateformats.json
+++ b/js/data/locale/zu/dateformats.json
@@ -130,7 +130,7 @@
                 "f": "{sm} {sd} – {em} {ed}, {ey}",
                 "l": "{sm} {sd} – {em} {ed}, {ey}",
                 "m": "{sm} {sd} – {em} {ed}, {ey}",
-                "s": "{sm}/{sd}/{sy} – {em}/{ed}/{ey}"
+                "s": "{sm}/{sd} – {em}/{ed}/{ey}"
             },
             "c12": {
                 "f": "{sm} {sd}, {sy} – {em} {ed}, {ey}",
diff --git a/js/data/locale/zu/sysres.json b/js/data/locale/zu/sysres.json
index e79e06ce74..9307175d77 100644
--- a/js/data/locale/zu/sysres.json
+++ b/js/data/locale/zu/sysres.json
@@ -97,7 +97,7 @@
     "1#1 yr|#{num} yrs": "one#{num} y|#{num} yrs",
     "durationMediumMillis": "one#{num} ms|#{num} ms",
     "1#1 se|#{num} sec": "one#{num} s|#{num} s",
-    "1#1 mi|#{num} min": "one#{num} min|#{num} min",
+    "1#1 mi|#{num} min": "one#{num} umzuzu|#{num} umzuzu",
     "durationMediumHours": "one#{num} hora|#{num} hora",
     "1#1 dy|#{num} dys": "one#{num}|#{num} suku",
     "durationMediumWeeks": "one#{num} w|#{num} w",
@@ -105,7 +105,7 @@
     "durationMediumYears": "one#{num} y|#{num} y",
     "durationShortMillis": "one#{num} ms|#{num} ms",
     "#{num}s": "one#{num} s|#{num} s",
-    "durationShortMinutes": "one#{num} min|#{num} min",
+    "durationShortMinutes": "one#{num} umzuzu|#{num} umzuzu",
     "#{num}h": "one#{num} hora|#{num} hora",
     "#{num}d": "one#{num}|#{num} suku",
     "#{num}w": "one#{num} w|#{num} w",
diff --git a/js/test/date/testMeridiems.js b/js/test/date/testMeridiems.js
index 6f29f37aae..44fb518658 100644
--- a/js/test/date/testMeridiems.js
+++ b/js/test/date/testMeridiems.js
@@ -28,7 +28,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_IQ: function(test) {
@@ -38,7 +38,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_MA: function(test) {
@@ -48,7 +48,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_as_IN: function(test) {
@@ -58,7 +58,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "পূৰ্বাহ্ন");
         test.equal(fmt[1].name, "অপৰাহ্ন");
-        
+
         test.done();
     },
     testMeridiem_bg_BG: function(test) {
@@ -68,7 +68,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "пр.об.");
         test.equal(fmt[1].name, "сл.об.");
-        
+
         test.done();
     },
     testMeridiem_bn_IN: function(test) {
@@ -78,7 +78,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_bs_Latn_BA: function(test) {
@@ -88,7 +88,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "prijepodne");
         test.equal(fmt[1].name, "popodne");
-        
+
         test.done();
     },
     testMeridiem_bs_Latn_ME: function(test) {
@@ -98,7 +98,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "prijepodne");
         test.equal(fmt[1].name, "popodne");
-        
+
         test.done();
     },
     testMeridiem_cs_CZ: function(test) {
@@ -108,7 +108,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "dop.");
         test.equal(fmt[1].name, "odp.");
-        
+
         test.done();
     },
     testMeridiem_da_DK: function(test) {
@@ -118,7 +118,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_de_AT: function(test) {
@@ -128,7 +128,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM"); //// CLDR 34 change
         test.equal(fmt[1].name, "PM"); //// CLDR 34 change
-        
+
         test.done();
     },
     testMeridiem_de_CH: function(test) {
@@ -138,7 +138,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_de_DE: function(test) {
@@ -148,7 +148,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_de_LU: function(test) {
@@ -158,7 +158,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_el_CY: function(test) {
@@ -168,7 +168,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "π.μ.");
         test.equal(fmt[1].name, "μ.μ.");
-        
+
         test.done();
     },
     testMeridiem_el_GR: function(test) {
@@ -178,7 +178,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "π.μ.");
         test.equal(fmt[1].name, "μ.μ.");
-        
+
         test.done();
     },
     testMeridiem_en_AM: function(test) {
@@ -188,7 +188,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_AU: function(test) {
@@ -198,7 +198,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_AZ: function(test) {
@@ -208,7 +208,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_CA: function(test) {
@@ -218,7 +218,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "a.m.");
         test.equal(fmt[1].name, "p.m.");
-        
+
         test.done();
     },
     testMeridiem_en_GB: function(test) {
@@ -228,7 +228,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_GH: function(test) {
@@ -238,7 +238,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_HK: function(test) {
@@ -248,7 +248,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_IE: function(test) {
@@ -258,7 +258,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "a.m.");
         test.equal(fmt[1].name, "p.m.");
-        
+
         test.done();
     },
     testMeridiem_en_IN: function(test) {
@@ -268,7 +268,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_IS: function(test) {
@@ -278,7 +278,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_JP: function(test) {
@@ -288,7 +288,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_KE: function(test) {
@@ -298,7 +298,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_KR: function(test) {
@@ -308,7 +308,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_LK: function(test) {
@@ -318,7 +318,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_MM: function(test) {
@@ -328,7 +328,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_MW: function(test) {
@@ -338,7 +338,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_MY: function(test) {
@@ -348,7 +348,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_NG: function(test) {
@@ -358,7 +358,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-         
+
         test.done();
     },
     testMeridiem_en_NZ: function(test) {
@@ -368,7 +368,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_PH: function(test) {
@@ -378,7 +378,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_PR: function(test) {
@@ -388,7 +388,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_SG: function(test) {
@@ -398,7 +398,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_US: function(test) {
@@ -408,7 +408,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_UG: function(test) {
@@ -418,7 +418,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_ZA: function(test) {
@@ -428,7 +428,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_ZM: function(test) {
@@ -438,7 +438,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_es_AR: function(test) {
@@ -446,9 +446,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-AR"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_BO: function(test) {
@@ -456,9 +456,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-BO"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_CL: function(test) {
@@ -466,9 +466,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-CL"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_CO: function(test) {
@@ -476,9 +476,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-CO"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_DO: function(test) {
@@ -486,9 +486,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-DO"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_EC: function(test) {
@@ -496,9 +496,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-EC"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_ES: function(test) {
@@ -506,9 +506,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-ES"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_GT: function(test) {
@@ -516,9 +516,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-GT"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_HN: function(test) {
@@ -526,9 +526,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-HN"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_MX: function(test) {
@@ -536,9 +536,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-MX"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_NI: function(test) {
@@ -546,9 +546,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-NI"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_PA: function(test) {
@@ -556,9 +556,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-PA"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_PE: function(test) {
@@ -566,9 +566,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-PE"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_PR: function(test) {
@@ -576,9 +576,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-PR"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_PY: function(test) {
@@ -586,9 +586,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-PY"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_SV: function(test) {
@@ -596,9 +596,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-SV"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_US: function(test) {
@@ -606,9 +606,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-US"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_UY: function(test) {
@@ -616,9 +616,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-UY"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_VE: function(test) {
@@ -626,9 +626,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-VE"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_et_EE: function(test) {
@@ -638,7 +638,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fa_AF: function(test) {
@@ -648,7 +648,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "قبل‌ازظهر");
         test.equal(fmt[1].name, "بعدازظهر");
-        
+
         test.done();
     },
     testMeridiem_fa_IR: function(test) {
@@ -658,7 +658,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "قبل‌ازظهر");
         test.equal(fmt[1].name, "بعدازظهر");
-        
+
         test.done();
     },
     testMeridiem_fi_FI: function(test) {
@@ -668,7 +668,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ap.");
         test.equal(fmt[1].name, "ip.");
-        
+
         test.done();
     },
     testMeridiem_fr_BE: function(test) {
@@ -678,7 +678,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_CA: function(test) {
@@ -688,7 +688,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "a.m.");
         test.equal(fmt[1].name, "p.m.");
-        
+
         test.done();
     },
     testMeridiem_fr_CH: function(test) {
@@ -698,7 +698,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_FR: function(test) {
@@ -708,7 +708,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_LU: function(test) {
@@ -718,7 +718,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ga_IE: function(test) {
@@ -728,7 +728,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "r.n.");
         test.equal(fmt[1].name, "i.n.");
-        
+
         test.done();
     },
     testMeridiem_gu_IN: function(test) {
@@ -738,7 +738,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_he_IL: function(test) {
@@ -748,16 +748,16 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "לפנה״צ");
         test.equal(fmt[1].name, "אחה״צ");
-        
+
         test.done();
     },
     testMeridiem_hi_IN: function(test) {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale:"hi-IN"});
         test.ok(fmt !== null);
-        
-        test.equal(fmt[0].name, "पूर्वाह्न");
-        test.equal(fmt[1].name, "अपराह्न");
+
+        test.equal(fmt[0].name, 'am');
+        test.equal(fmt[1].name, 'pm');
         test.done();
     },
     testMeridiem_hr_HR: function(test) {
@@ -767,7 +767,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_hr_ME: function(test) {
@@ -777,7 +777,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_hr_HU: function(test) {
@@ -787,7 +787,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_id_ID: function(test) {
@@ -797,7 +797,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_is_IS: function(test) {
@@ -807,7 +807,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "f.h.");
         test.equal(fmt[1].name, "e.h.");
-        
+
         test.done();
     },
     testMeridiem_it_CH: function(test) {
@@ -817,7 +817,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_it_IT: function(test) {
@@ -827,7 +827,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ja_JP: function(test) {
@@ -837,7 +837,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "午前");
         test.equal(fmt[1].name, "午後");
-        
+
         test.done();
     },
     testMeridiem_kk_KZ: function(test) {
@@ -847,14 +847,14 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_kn_IN: function(test) {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale:"kn-IN"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt[0].name, "ಪೂರ್ವಾಹ್ನ");
         test.equal(fmt[1].name, "ಅಪರಾಹ್ನ");
         test.done();
@@ -866,7 +866,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "오전");
         test.equal(fmt[1].name, "오후");
-        
+
         test.done();
     },
     testMeridiem_ku_IQ: function(test) {
@@ -874,9 +874,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"ku-IQ"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "ب.ن");
-        test.equal(fmt[1].name, "د.ن");
-        
+        test.equal(fmt[0].name, 'ب.ن');
+        test.equal(fmt[1].name, 'د.ن');
+
         test.done();
     },
     testMeridiem_lt_LT: function(test) {
@@ -886,7 +886,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "priešpiet");
         test.equal(fmt[1].name, "popiet");
-        
+
         test.done();
     },
     testMeridiem_lv_LV: function(test) {
@@ -896,7 +896,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "priekšpusdienā");
         test.equal(fmt[1].name, "pēcpusdienā");
-        
+
         test.done();
     },
     testMeridiem_mk_MK: function(test) {
@@ -906,7 +906,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "претпладне");
         test.equal(fmt[1].name, "попладне");
-        
+
         test.done();
     },
     testMeridiem_ml_IN: function(test) {
@@ -916,7 +916,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_mr_IN: function(test) {
@@ -926,7 +926,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "म.पू.");
         test.equal(fmt[1].name, "म.उ.");
-        
+
         test.done();
     },
     testMeridiem_ms_MY: function(test) {
@@ -936,7 +936,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "PG");
         test.equal(fmt[1].name, "PTG");
-        
+
         test.done();
     },
     testMeridiem_nb_NO: function(test) {
@@ -946,7 +946,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "a.m.");
         test.equal(fmt[1].name, "p.m.");
-        
+
         test.done();
     },
     testMeridiem_nl_BE: function(test) {
@@ -956,7 +956,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "a.m.");
         test.equal(fmt[1].name, "p.m.");
-        
+
         test.done();
     },
     testMeridiem_nl_NL: function(test) {
@@ -966,7 +966,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "a.m.");
         test.equal(fmt[1].name, "p.m.");
-        
+
         test.done();
     },
     testMeridiem_pa_Guru_IN: function(test) {
@@ -976,7 +976,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ਪੂ.ਦੁ.");
         test.equal(fmt[1].name, "ਬਾ.ਦੁ.");
-        
+
         test.done();
     },
     testMeridiem_pl_PL: function(test) {
@@ -986,7 +986,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_pt_BR: function(test) {
@@ -996,7 +996,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_pt_PT: function(test) {
@@ -1006,7 +1006,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "da manhã");
         test.equal(fmt[1].name, "da tarde");
-        
+
         test.done();
     },
     testMeridiem_ro_RO: function(test) {
@@ -1016,7 +1016,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "a.m.");
         test.equal(fmt[1].name, "p.m.");
-        
+
         test.done();
     },
     testMeridiem_sr_Cyrl_RS: function(test) {
@@ -1026,7 +1026,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "пре подне");
         test.equal(fmt[1].name, "по подне");
-        
+
         test.done();
     },
     testMeridiem_sr_Latn_RS: function(test) {
@@ -1036,7 +1036,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "pre podne");
         test.equal(fmt[1].name, "po podne");
-        
+
         test.done();
     },
     testMeridiem_ru_BY: function(test) {
@@ -1046,7 +1046,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ru_KG: function(test) {
@@ -1056,7 +1056,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ru_KZ: function(test) {
@@ -1066,7 +1066,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ru_GE: function(test) {
@@ -1076,7 +1076,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ru_RU: function(test) {
@@ -1086,7 +1086,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ru_UA: function(test) {
@@ -1096,7 +1096,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_sk_SK: function(test) {
@@ -1106,7 +1106,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_sl_SI: function(test) {
@@ -1116,7 +1116,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "dop.");
         test.equal(fmt[1].name, "pop.");
-        
+
         test.done();
     },
     testMeridiem_sq_AL: function(test) {
@@ -1125,7 +1125,7 @@ module.exports.testmeridiems = {
         test.ok(fmt !== null);
         test.equal(fmt[0].name, "e paradites");
         test.equal(fmt[1].name, "e pasdites");
-        
+
         test.done();
     },
     testMeridiem_sq_ME: function(test) {
@@ -1134,7 +1134,7 @@ module.exports.testmeridiems = {
         test.ok(fmt !== null);
         test.equal(fmt[0].name, "e paradites");
         test.equal(fmt[1].name, "e pasdites");
-        
+
         test.done();
     },
     testMeridiem_sv_FI: function(test) {
@@ -1144,7 +1144,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "fm");
         test.equal(fmt[1].name, "em");
-        
+
         test.done();
     },
     testMeridiem_sv_SE: function(test) {
@@ -1154,7 +1154,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "fm");
         test.equal(fmt[1].name, "em");
-        
+
         test.done();
     },
     testMeridiem_ta_IN: function(test) {
@@ -1164,7 +1164,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "முற்பகல்");
         test.equal(fmt[1].name, "பிற்பகல்");
-        
+
         test.done();
     },
     testMeridiem_te_IN: function(test) {
@@ -1174,7 +1174,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_th_TH: function(test) {
@@ -1184,7 +1184,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ก่อนเที่ยง");
         test.equal(fmt[1].name, "หลังเที่ยง");
-        
+
         test.done();
     },
     testMeridiem_tr_AM: function(test) {
@@ -1194,7 +1194,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ÖÖ");
         test.equal(fmt[1].name, "ÖS");
-        
+
         test.done();
     },
     testMeridiem_tr_AZ: function(test) {
@@ -1204,7 +1204,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ÖÖ");
         test.equal(fmt[1].name, "ÖS");
-        
+
         test.done();
     },
     testMeridiem_tr_CY: function(test) {
@@ -1214,7 +1214,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ÖÖ");
         test.equal(fmt[1].name, "ÖS");
-        
+
         test.done();
     },
     testMeridiem_tr_TR: function(test) {
@@ -1224,7 +1224,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ÖÖ");
         test.equal(fmt[1].name, "ÖS");
-        
+
         test.done();
     },
     testMeridiem_uk_UA: function(test) {
@@ -1234,7 +1234,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "дп");
         test.equal(fmt[1].name, "пп");
-        
+
         test.done();
     },
     testMeridiem_ur_IN: function(test) {
@@ -1244,7 +1244,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_uz_Latn_UZ: function(test) {
@@ -1254,7 +1254,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "TO");
         test.equal(fmt[1].name, "TK");
-        
+
         test.done();
     },
     testMeridiem_vi_VN: function(test) {
@@ -1264,7 +1264,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "SA");
         test.equal(fmt[1].name, "CH");
-        
+
         test.done();
     },
     testMeridiem_zh_Hans_CN: function(test) {
@@ -1274,7 +1274,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "上午");
         test.equal(fmt[1].name, "下午");
-        
+
         test.done();
     },
     testMeridiem_zh_Hant_HK: function(test) {
@@ -1284,7 +1284,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "上午");
         test.equal(fmt[1].name, "下午");
-        
+
         test.done();
     },
     testMeridiem_zh_Hant_TW: function(test) {
@@ -1294,7 +1294,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "上午");
         test.equal(fmt[1].name, "下午");
-        
+
         test.done();
     },
     testMeridiem_en_GE: function(test) {
@@ -1304,7 +1304,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_CN: function(test) {
@@ -1314,7 +1314,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_MX: function(test) {
@@ -1324,7 +1324,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_TW: function(test) {
@@ -1334,7 +1334,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_mn_MN: function(test) {
@@ -1344,7 +1344,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ү.ө.");
         test.equal(fmt[1].name, "ү.х.");
-        
+
         test.done();
     },
     testMeridiem_es_CA: function(test) {
@@ -1352,9 +1352,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-CA"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_af_ZA: function(test) {
@@ -1364,7 +1364,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "vm.");
         test.equal(fmt[1].name, "nm.");
-        
+
         test.done();
     },
     testMeridiem_am_ET: function(test) {
@@ -1391,7 +1391,7 @@ module.exports.testmeridiems = {
         test.equal(fmt[4].name, "ከሌሊቱ");
         test.equal(fmt[4].start, "18:00");
         test.equal(fmt[4].end, "23:59");
-        
+
         test.done();
     },
     testMeridiem_ha_Latn_NG: function(test) {
@@ -1399,9 +1399,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"ha-Latn-NG"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "AM");
-        test.equal(fmt[1].name, "PM");
-        
+        test.equal(fmt[0].name, 'Safiya');
+        test.equal(fmt[1].name, 'Yamma');
+
         test.done();
     },
     testMeridiem_or_IN: function(test) {
@@ -1411,7 +1411,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_az_Latn_AZ: function(test) {
@@ -1421,7 +1421,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_km_KH: function(test) {
@@ -1431,7 +1431,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_si_LK: function(test) {
@@ -1441,7 +1441,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "පෙ.ව.");
         test.equal(fmt[1].name, "ප.ව.");
-        
+
         test.done();
     },
     testMeridiem_ar_AE: function(test) {
@@ -1451,7 +1451,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_BH: function(test) {
@@ -1461,7 +1461,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_DJ: function(test) {
@@ -1471,7 +1471,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_DZ: function(test) {
@@ -1481,7 +1481,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_JO: function(test) {
@@ -1491,7 +1491,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_KW: function(test) {
@@ -1501,7 +1501,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_LB: function(test) {
@@ -1511,7 +1511,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_LY: function(test) {
@@ -1521,7 +1521,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_MR: function(test) {
@@ -1531,7 +1531,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_OM: function(test) {
@@ -1541,7 +1541,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_QA: function(test) {
@@ -1551,7 +1551,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_SA: function(test) {
@@ -1571,7 +1571,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_SY: function(test) {
@@ -1581,7 +1581,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "ص");
         test.equal(fmt[1].name, "م");
-        
+
         test.done();
     },
     testMeridiem_ar_TN: function(test) {
@@ -1611,7 +1611,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_en_GM: function(test) {
@@ -1621,7 +1621,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_LR: function(test) {
@@ -1631,7 +1631,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_PK: function(test) {
@@ -1641,7 +1641,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_RW: function(test) {
@@ -1651,7 +1651,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_SD: function(test) {
@@ -1661,7 +1661,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_SL: function(test) {
@@ -1671,7 +1671,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_en_TZ: function(test) {
@@ -1681,7 +1681,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "am");
         test.equal(fmt[1].name, "pm");
-        
+
         test.done();
     },
     testMeridiem_es_CR: function(test) {
@@ -1689,9 +1689,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-CR"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_GQ: function(test) {
@@ -1699,9 +1699,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-GQ"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_es_PH: function(test) {
@@ -1709,9 +1709,9 @@ module.exports.testmeridiems = {
         var fmt = DateFmt.getMeridiemsRange({locale:"es-PH"});
         test.ok(fmt !== null);
 
-        test.equal(fmt[0].name, "a. m.");
-        test.equal(fmt[1].name, "p. m.");
-        
+        test.equal(fmt[0].name, 'a. m.');
+        test.equal(fmt[1].name, 'p. m.');
+
         test.done();
     },
     testMeridiem_fr_BF: function(test) {
@@ -1721,7 +1721,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_BJ: function(test) {
@@ -1731,7 +1731,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_CD: function(test) {
@@ -1741,7 +1741,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_CF: function(test) {
@@ -1751,7 +1751,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_CG: function(test) {
@@ -1761,7 +1761,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_CI: function(test) {
@@ -1771,7 +1771,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_CM: function(test) {
@@ -1781,7 +1781,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "matin");
         test.equal(fmt[1].name, "soir");
-        
+
         test.done();
     },
     testMeridiem_fr_GQ: function(test) {
@@ -1791,7 +1791,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_DJ: function(test) {
@@ -1801,7 +1801,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_DZ: function(test) {
@@ -1811,7 +1811,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_GA: function(test) {
@@ -1821,7 +1821,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_GN: function(test) {
@@ -1831,7 +1831,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_LB: function(test) {
@@ -1841,7 +1841,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_ML: function(test) {
@@ -1851,7 +1851,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_RW: function(test) {
@@ -1861,7 +1861,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_SN: function(test) {
@@ -1871,7 +1871,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_fr_TG: function(test) {
@@ -1881,7 +1881,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_ms_SG: function(test) {
@@ -1891,17 +1891,17 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "PG");
         test.equal(fmt[1].name, "PTG");
-        
+
         test.done();
     },
     testMeridiem_pa_Arab_PK: function(test) {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale:"pa-Arab-PK"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt[0].name, 'AM');
         test.equal(fmt[1].name, 'PM');
-        
+
         test.done();
     },
     testMeridiem_pt_AO: function(test) {
@@ -1911,7 +1911,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "da manhã");
         test.equal(fmt[1].name, "da tarde");
-        
+
         test.done();
     },
     testMeridiem_pt_GQ: function(test) {
@@ -1921,7 +1921,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "da manhã");
         test.equal(fmt[1].name, "da tarde");
-        
+
         test.done();
     },
     testMeridiem_pt_CV: function(test) {
@@ -1931,7 +1931,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "da manhã");
         test.equal(fmt[1].name, "da tarde");
-        
+
         test.done();
     },
     testMeridiem_ur_PK: function(test) {
@@ -1941,7 +1941,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
-        
+
         test.done();
     },
     testMeridiem_zh_Hans_SG: function(test) {
@@ -1951,7 +1951,7 @@ module.exports.testmeridiems = {
 
         test.equal(fmt[0].name, "上午");
         test.equal(fmt[1].name, "下午");
-        
+
         test.done();
     },
     testMeridiem_zh_Hans_MY: function(test) {
diff --git a/js/test/date/testMonthTranslation.js b/js/test/date/testMonthTranslation.js
index 0c709f82fa..d468675dc9 100644
--- a/js/test/date/testMonthTranslation.js
+++ b/js/test/date/testMonthTranslation.js
@@ -35,7 +35,7 @@ module.exports.testmonthtranslation = {
     },
     testMonthTranslate_ar_EG: function(test) {
         test.expect(12);
-        
+
         // full, long: MMMM
         // medium: MM
         // short: M
@@ -56,7 +56,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9],"أكتوبر");
         test.equal(value[10],"نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
 
@@ -84,7 +84,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9],"تشرين الأول");
         test.equal(value[10],"تشرين الثاني");
         test.equal(value[11], "كانون الأول");
-        
+
         test.done();
     },
     testMonthTranslate_ar_MA: function(test) {
@@ -111,7 +111,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نونبر");
         test.equal(value[11], "دجنبر");
-        
+
         test.done();
     },
     testMonthTranslate_as_IN: function(test) {
@@ -137,7 +137,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "অক্টোবৰ");
         test.equal(value[10], "নৱেম্বৰ");
         test.equal(value[11], "ডিচেম্বৰ");
-        
+
         test.done();
     },
     testMonthTranslate_bg_BG: function(test) {
@@ -206,7 +206,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "অক্টোবর");
         test.equal(value[10], "নভেম্বর");
         test.equal(value[11], "ডিসেম্বর");
-        
+
         test.done();
     },
 
@@ -253,7 +253,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt");
         test.equal(value[10], "nov");
         test.equal(value[11], "dec");
-        
+
         test.done();
     },
     testMonthTranslate_bs_Latn_ME: function(test) {
@@ -299,7 +299,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt");
         test.equal(value[10], "nov");
         test.equal(value[11], "dec");
-        
+
         test.done();
     },
     testMonthTranslate_cs_CZ: function(test) {
@@ -326,7 +326,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "říjen");
         test.equal(value[10], "listopad");
         test.equal(value[11], "prosinec");
-        
+
         test.done();
     },
     testMonthTranslate_da_DK: function(test) {
@@ -359,7 +359,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "jan.");
         test.equal(value[1], "feb.");
         test.equal(value[2], "mar.");
@@ -372,7 +372,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_de_AT: function(test) {
@@ -399,7 +399,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oktober");
         test.equal(value[10], "November");
         test.equal(value[11], "Dezember");
-        
+
         test.done();
     },
     testMonthTranslate_de_CH: function(test) {
@@ -426,7 +426,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oktober");
         test.equal(value[10], "November");
         test.equal(value[11], "Dezember");
-        
+
         test.done();
     },
     testMonthTranslate_de_DE: function(test) {
@@ -453,10 +453,10 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oktober");
         test.equal(value[10], "November");
         test.equal(value[11], "Dezember");
-        
+
         test.done();
     },
-    
+
     testMonthTranslate_de_LU: function(test) {
         test.expect(12);
 
@@ -482,7 +482,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oktober");
         test.equal(value[10], "November");
         test.equal(value[11], "Dezember");
-        
+
         test.done();
     },
     testMonthTranslate_el_CY: function(test) {
@@ -515,7 +515,7 @@ module.exports.testmonthtranslation = {
         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], "Μάρ");
@@ -528,7 +528,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Οκτ");
         test.equal(value[10], "Νοέ");
         test.equal(value[11], "Δεκ");
-        
+
         test.done();
     },
     testMonthTranslate_el_GR: function(test) {
@@ -561,7 +561,7 @@ module.exports.testmonthtranslation = {
         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], "Μάρ");
@@ -574,7 +574,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Οκτ");
         test.equal(value[10], "Νοέ");
         test.equal(value[11], "Δεκ");
-        
+
         test.done();
     },
     testMonthTranslate_en_AM: function(test) {
@@ -607,7 +607,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -620,7 +620,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_AU: function(test) {
@@ -653,7 +653,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -665,8 +665,8 @@ module.exports.testmonthtranslation = {
         test.equal(value[8], "Sep");
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
-        test.equal(value[11], "Dec");        
-        
+        test.equal(value[11], "Dec");
+
         test.done();
     },
     testMonthTranslate_en_AZ: function(test) {
@@ -694,7 +694,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -707,7 +707,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_CA: function(test) {
@@ -739,7 +739,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan.");
         test.equal(value[1], "Feb.");
         test.equal(value[2], "Mar.");
@@ -752,7 +752,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct.");
         test.equal(value[10], "Nov.");
         test.equal(value[11], "Dec.");
-        
+
         test.done();
     },
     testMonthTranslate_en_GB: function(test) {
@@ -784,7 +784,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -797,7 +797,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_GH: function(test) {
@@ -829,7 +829,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -842,7 +842,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_HK: function(test) {
@@ -874,7 +874,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -887,7 +887,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_IE: function(test) {
@@ -920,7 +920,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -933,7 +933,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_IN: function(test) {
@@ -966,7 +966,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -979,7 +979,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_IS: function(test) {
@@ -1031,7 +1031,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_KE: function(test) {
@@ -1076,7 +1076,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_KR: function(test) {
@@ -1102,7 +1102,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_LK: function(test) {
@@ -1128,7 +1128,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_MM: function(test) {
@@ -1154,7 +1154,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_MW: function(test) {
@@ -1199,7 +1199,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_MY: function(test) {
@@ -1243,7 +1243,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_NG: function(test) {
@@ -1287,7 +1287,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_NZ: function(test) {
@@ -1314,7 +1314,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_PH: function(test) {
@@ -1358,7 +1358,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_PR: function(test) {
@@ -1391,7 +1391,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -1437,7 +1437,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -1450,12 +1450,12 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_US: function(test) {
         test.expect(24);
- 
+
         // full, long: MMMM
         // medium: MMM
         // short: M
@@ -1483,7 +1483,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -1496,13 +1496,13 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
-    
+
     testMonthTranslate_en_UG: function(test) {
         test.expect(24);
-        
+
         // full, long: MMMM
         // medium: MMM
         // short: MM
@@ -1530,7 +1530,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -1543,7 +1543,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_ZA: function(test) {
@@ -1576,7 +1576,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -1589,7 +1589,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_en_ZM: function(test) {
@@ -1622,7 +1622,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Jan");
         test.equal(value[1], "Feb");
         test.equal(value[2], "Mar");
@@ -1635,7 +1635,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dec");
-        
+
         test.done();
     },
     testMonthTranslate_es_AR: function(test) {
@@ -1679,10 +1679,10 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
-    
+
     testMonthTranslate_es_BO: function(test) {
         test.expect(24);
 
@@ -1713,7 +1713,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ene.");
         test.equal(value[1], "feb.");
         test.equal(value[2], "mar.");
@@ -1726,7 +1726,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_CL: function(test) {
@@ -1782,7 +1782,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "octubre");
         test.equal(value[10], "noviembre");
         test.equal(value[11], "diciembre");
-        
+
         test.done();
     },
     testMonthTranslate_es_DO: function(test) {
@@ -1815,7 +1815,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ene.");
         test.equal(value[1], "feb.");
         test.equal(value[2], "mar.");
@@ -1828,7 +1828,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
 
@@ -1838,7 +1838,7 @@ module.exports.testmonthtranslation = {
         // full, long: MMMM
         // medium: MMM
         // short: M
-        
+
         var value = [], i;
         var fmt = new DateFmt({locale:"es-EC", date:"m", length: "full", useNative:false, timezone:"local"})
         for (i=0; i < 12; i++) {
@@ -1862,7 +1862,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ene.");
         test.equal(value[1], "feb.");
         test.equal(value[2], "mar.");
@@ -1907,7 +1907,7 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ene.");
         test.equal(value[1], "feb.");
         test.equal(value[2], "mar.");
@@ -1920,7 +1920,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_GT: function(test) {
@@ -1947,7 +1947,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "octubre");
         test.equal(value[10], "noviembre");
         test.equal(value[11], "diciembre");
-        
+
         test.done();
     },
     testMonthTranslate_es_HN: function(test) {
@@ -1991,7 +1991,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_MX: function(test) {
@@ -2023,19 +2023,19 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        test.equal(value[0], "ene");
-        test.equal(value[1], "feb");
-        test.equal(value[2], "mar");
-        test.equal(value[3], "abr");
-        test.equal(value[4], "may");
-        test.equal(value[5], "jun");
-        test.equal(value[6], "jul");
-        test.equal(value[7], "ago");
-        test.equal(value[8], "sep");
-        test.equal(value[9], "oct");
-        test.equal(value[10], "nov");
-        test.equal(value[11], "dic");
-        
+        test.equal(value[0], 'ene.');
+        test.equal(value[1], 'feb.');
+        test.equal(value[2], 'mar.');
+        test.equal(value[3], 'abr.');
+        test.equal(value[4], 'may.');
+        test.equal(value[5], 'jun.');
+        test.equal(value[6], 'jul.');
+        test.equal(value[7], 'ago.');
+        test.equal(value[8], 'sep.');
+        test.equal(value[9], 'oct.');
+        test.equal(value[10], 'nov.');
+        test.equal(value[11], 'dic.');
+
         test.done();
     },
     testMonthTranslate_es_NI: function(test) {
@@ -2079,7 +2079,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_PA: function(test) {
@@ -2106,7 +2106,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "octubre");
         test.equal(value[10], "noviembre");
         test.equal(value[11], "diciembre");
-        
+
         test.done();
     },
     testMonthTranslate_es_PE: function(test) {
@@ -2150,7 +2150,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct.");
         test.equal(value[10], "Nov.");
         test.equal(value[11], "Dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_PR: function(test) {
@@ -2177,7 +2177,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "octubre");
         test.equal(value[10], "noviembre");
         test.equal(value[11], "diciembre");
-        
+
         test.done();
     },
     testMonthTranslate_es_PY: function(test) {
@@ -2221,7 +2221,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_SV: function(test) {
@@ -2265,7 +2265,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_US: function(test) {
@@ -2309,7 +2309,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_UY: function(test) {
@@ -2353,12 +2353,12 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Oct.");
         test.equal(value[10], "Nov.");
         test.equal(value[11], "Dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_VE: function(test) {
         test.expect(24);
-        
+
         // full, long: MMMM
         // medium: MMM
         // short: M
@@ -2398,13 +2398,13 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
-    
+
     testMonthTranslate_et_EE: function(test) {
         test.expect(24);
-        
+
         // full, long: MMMM
         // medium: MMM
         // short: MM
@@ -2444,7 +2444,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt");
         test.equal(value[10], "nov");
         test.equal(value[11], "dets");
-        
+
         test.done();
     },
     testMonthTranslate_fa_AF: function(test) {
@@ -2491,10 +2491,10 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "دی");
         test.equal(value[10], "بهمن");
         test.equal(value[11], "اسفند");
-        
+
         test.done();
     },
-    
+
     testMonthTranslate_fa_IR: function(test) {
         test.expect(24);
 
@@ -2537,7 +2537,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "دی");
         test.equal(value[10], "بهمن");
         test.equal(value[11], "اسفند");
-        
+
         test.done();
     },
     testMonthTranslate_fi_FI: function(test) {
@@ -2564,7 +2564,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "lokakuu");
         test.equal(value[10], "marraskuu");
         test.equal(value[11], "joulukuu");
-        
+
         test.done();
     },
     testMonthTranslate_fr_BE: function(test) {
@@ -2609,7 +2609,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_CA: function(test) {
@@ -2698,7 +2698,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_FR: function(test) {
@@ -2743,7 +2743,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_LU: function(test) {
@@ -2833,7 +2833,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "DFómh");
         test.equal(value[10], "Samh");
         test.equal(value[11], "Noll");
-        
+
         test.done();
     },
     testMonthTranslate_gu_IN: function(test) {
@@ -2878,7 +2878,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "ઑક્ટો");
         test.equal(value[10], "નવે");
         test.equal(value[11], "ડિસે");
-        
+
         test.done();
     },
     testMonthTranslate_he_IL: function(test) {
@@ -2923,7 +2923,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "אוק׳");
         test.equal(value[10], "נוב׳");
         test.equal(value[11],"דצמ׳");
-        
+
         test.done();
     },
     testMonthTranslate_hi_IN: function(test) {
@@ -2968,7 +2968,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "अक्तू॰");
         test.equal(value[10], "नव॰");
         test.equal(value[11], "दिस॰");
-        
+
         test.done();
     },
         testMonthTranslate_hr_HR: function(test) {
@@ -3013,7 +3013,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "lis");
         test.equal(value[10], "stu");
         test.equal(value[11], "pro");
-        
+
         test.done();
     },
     testMonthTranslate_hr_ME: function(test) {
@@ -3038,7 +3038,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "listopad");
         test.equal(value[10], "studeni");
         test.equal(value[11], "prosinac");
-        
+
         test.done();
     },
     testMonthTranslate_hr_HU: function(test) {
@@ -3063,7 +3063,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "listopad");
         test.equal(value[10], "studeni");
         test.equal(value[11], "prosinac");
-        
+
         test.done();
     },
     testMonthTranslate_id_ID: function(test) {
@@ -3155,7 +3155,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nóv.");
         test.equal(value[11], "des.");
-        
+
         test.done();
     },
     testMonthTranslate_it_CH: function(test) {
@@ -3200,7 +3200,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "ott");
         test.equal(value[10], "nov");
         test.equal(value[11], "dic");
-        
+
         test.done();
     },
     testMonthTranslate_it_IT: function(test) {
@@ -3270,7 +3270,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10月");
         test.equal(value[10], "11月");
         test.equal(value[11], "12月");
-        
+
         test.done();
     },
     testMonthTranslate_kk_KZ: function(test) {
@@ -3315,7 +3315,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "қаз.");
         test.equal(value[10], "қар.");
         test.equal(value[11], "жел.");
-        
+
         test.done();
     },
     testMonthTranslate_kn_IN: function(test) {
@@ -3362,7 +3362,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "ಅಕ್ಟೋ");
         test.equal(value[10],"ನವೆಂ");
         test.equal(value[11],"ಡಿಸೆಂ");
-        
+
         test.done();
     },
     testMonthTranslate_ko_KR: function(test) {
@@ -3389,7 +3389,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10월");
         test.equal(value[10], "11월");
         test.equal(value[11], "12월");
-        
+
         test.done();
     },
     testMonthTranslate_ku_IQ: function(test) {
@@ -3461,7 +3461,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "spalis");
         test.equal(value[10], "lapkritis");
         test.equal(value[11], "gruodis");
-        
+
         test.done();
     },
     testMonthTranslate_lv_LV: function(test) {
@@ -3506,7 +3506,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_mk_MK: function(test) {
@@ -3533,7 +3533,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "октомври");
         test.equal(value[10], "ноември");
         test.equal(value[11], "декември");
-        
+
         test.done();
     },
     testMonthTranslate_ml_IN: function(test) {
@@ -3560,7 +3560,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9],  "ഒക്‌ടോബർ");
         test.equal(value[10],"നവംബർ");
         test.equal(value[11],"ഡിസംബർ");
-        
+
         var fmt = new DateFmt({locale:"ml-IN", date:"m", length: "medium", useNative:false, timezone:"local"});
 
         for (i=0; i < 12; i++) {
@@ -3578,7 +3578,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "ഒക്ടോ");
         test.equal(value[10], "നവം");
         test.equal(value[11], "ഡിസം");
-        
+
         test.done();
     },
     testMonthTranslate_mr_IN: function(test) {
@@ -3602,7 +3602,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9],"ऑक्टोबर");
         test.equal(value[10],"नोव्हेंबर");
         test.equal(value[11], "डिसेंबर");
-        
+
         test.done();
     },
     testMonthTranslate_ms_MY: function(test) {
@@ -3647,7 +3647,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Okt");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dis");
-        
+
         test.done();
     },
     testMonthTranslate_nb_NO: function(test) {
@@ -3692,7 +3692,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "des.");
-        
+
         test.done();
     },
     testMonthTranslate_nl_BE: function(test) {
@@ -3737,7 +3737,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_nl_NL: function(test) {
@@ -3782,7 +3782,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_pa_Guru_IN: function(test) {
@@ -3827,7 +3827,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9],  "ਅਕਤੂ");
         test.equal(value[10],"ਨਵੰ");
         test.equal(value[11],"ਦਸੰ");
-        
+
         test.done();
     },
     testMonthTranslate_pl_PL: function(test) {
@@ -3873,7 +3873,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "paź");
         test.equal(value[10], "lis");
         test.equal(value[11], "gru");
-        
+
         test.done();
     },
     testMonthTranslate_pt_BR: function(test) {
@@ -3898,7 +3898,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "outubro");
         test.equal(value[10], "novembro");
         test.equal(value[11], "dezembro");
-        
+
         test.done();
     },
     testMonthTranslate_pt_PT: function(test) {
@@ -3970,7 +3970,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_sr_Cyrl_RS: function(test) {
@@ -3997,7 +3997,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "октобар");
         test.equal(value[10], "новембар");
         test.equal(value[11], "децембар");
-        
+
         test.done();
     },
     testMonthTranslate_sr_Latn_RS: function(test) {
@@ -4024,7 +4024,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oktobar");
         test.equal(value[10], "novembar");
         test.equal(value[11], "decembar");
-        
+
         test.done();
     },
     testMonthTranslate_ru_BY: function(test) {
@@ -4069,7 +4069,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "окт.");
         test.equal(value[10], "нояб.");
         test.equal(value[11], "дек.");
-        
+
         test.done();
     },
     testMonthTranslate_ru_KG: function(test) {
@@ -4114,7 +4114,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "окт.");
         test.equal(value[10], "нояб.");
         test.equal(value[11], "дек.");
-        
+
         test.done();
     },
     testMonthTranslate_ru_KZ: function(test) {
@@ -4159,7 +4159,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "окт.");
         test.equal(value[10], "нояб.");
         test.equal(value[11], "дек.");
-        
+
         test.done();
     },
     testMonthTranslate_ru_GE: function(test) {
@@ -4184,7 +4184,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "октябрь");
         test.equal(value[10], "ноябрь");
         test.equal(value[11], "декабрь");
-        
+
         test.done();
     },
     testMonthTranslate_ru_RU: function(test) {
@@ -4229,7 +4229,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "окт.");
         test.equal(value[10], "нояб.");
         test.equal(value[11], "дек.");
-        
+
         test.done();
     },
     testMonthTranslate_ru_UA: function(test) {
@@ -4301,7 +4301,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "október");
         test.equal(value[10], "november");
         test.equal(value[11], "december");
-        
+
         test.done();
     },
     testMonthTranslate_sl_SI: function(test) {
@@ -4346,7 +4346,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_sq_AL: function(test) {
@@ -4391,7 +4391,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "tet");
         test.equal(value[10], "nën");
         test.equal(value[11], "dhj");
-        
+
         test.done();
     },
     testMonthTranslate_sq_ME: function(test) {
@@ -4438,7 +4438,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "tet");
         test.equal(value[10], "nën");
         test.equal(value[11], "dhj");
-        
+
         test.done();
     },
     testMonthTranslate_sv_FI: function(test) {
@@ -4483,7 +4483,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_sv_SE: function(test) {
@@ -4528,7 +4528,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dec.");
-        
+
         test.done();
     },
     testMonthTranslate_ta_IN: function(test) {
@@ -4573,7 +4573,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "அக்.");
         test.equal(value[10],"நவ.");
         test.equal(value[11], "டிச.");
-        
+
         test.done();
     },
     testMonthTranslate_te_IN: function(test) {
@@ -4606,7 +4606,7 @@ module.exports.testmonthtranslation = {
         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], "మార్చి");
@@ -4641,7 +4641,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[5], "มิถุนายน");
         test.equal(value[6], "กรกฎาคม");
         test.equal(value[7], "สิงหาคม");
-        test.equal(value[8], "กันยายน"); 
+        test.equal(value[8], "กันยายน");
         test.equal(value[9], "ตุลาคม");
         test.equal(value[10], "พฤศจิกายน");
         test.equal(value[11], "ธันวาคม");
@@ -4659,7 +4659,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[5], "มิ.ย.");
         test.equal(value[6], "ก.ค.");
         test.equal(value[7], "ส.ค.");
-        test.equal(value[8], "ก.ย."); 
+        test.equal(value[8], "ก.ย.");
         test.equal(value[9], "ต.ค.");
         test.equal(value[10], "พ.ย.");
         test.equal(value[11], "ธ.ค.");
@@ -4707,7 +4707,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Eki");
         test.equal(value[10], "Kas");
         test.equal(value[11], "Ara");
-        
+
         test.done();
     },
     testMonthTranslate_tr_AZ: function(test) {
@@ -4732,7 +4732,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Ekim");
         test.equal(value[10], "Kasım");
         test.equal(value[11], "Aralık");
-        
+
         test.done();
     },
     testMonthTranslate_tr_CY: function(test) {
@@ -4777,7 +4777,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Eki");
         test.equal(value[10], "Kas");
         test.equal(value[11], "Ara");
-        
+
         test.done();
     },
     testMonthTranslate_tr_TR: function(test) {
@@ -4822,7 +4822,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Eki");
         test.equal(value[10], "Kas");
         test.equal(value[11], "Ara");
-        
+
         test.done();
     },
     testMonthTranslate_uk_UA: function(test) {
@@ -4867,7 +4867,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "жов");
         test.equal(value[10], "лис");
         test.equal(value[11], "гру");
-        
+
         test.done();
     },
     testMonthTranslate_ur_IN: function(test) {
@@ -4913,7 +4913,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9],"اکتوبر");
         test.equal(value[10],"نومبر");
         test.equal(value[11],"دسمبر");
-       
+
         test.done();
     },
     testMonthTranslate_uz_Latn_UZ: function(test) {
@@ -4958,7 +4958,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Okt");
         test.equal(value[10], "Noy");
         test.equal(value[11], "Dek");
-        
+
         test.done();
     },
     testMonthTranslate_vi_VN: function(test) {
@@ -4985,7 +4985,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Tháng 10");
         test.equal(value[10], "Tháng 11");
         test.equal(value[11], "Tháng 12");
-        
+
         var fmt = new DateFmt({locale:"vi-VN", date:"m", length: "medium", useNative:false, timezone:"local"})
 
         for (i=0; i < 12; i++) {
@@ -5025,7 +5025,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10月");
         test.equal(value[10], "11月");
         test.equal(value[11], "12月");
-        
+
         test.done();
     },
     testMonthTranslate_zh_Hant_HK: function(test) {
@@ -5048,7 +5048,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10月");
         test.equal(value[10], "11月");
         test.equal(value[11], "12月");
-        
+
         test.done();
     },
     testMonthTranslate_zh_Hant_TW: function(test) {
@@ -5071,7 +5071,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10月");
         test.equal(value[10], "11月");
         test.equal(value[11], "12月");
-        
+
         test.done();
     },
     testMonthTranslate_en_GE: function(test) {
@@ -5096,7 +5096,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_CN: function(test) {
@@ -5122,7 +5122,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_MX: function(test) {
@@ -5147,7 +5147,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_TW: function(test) {
@@ -5173,7 +5173,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_mn_MN: function(test) {
@@ -5200,7 +5200,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10-р сар");
         test.equal(value[10], "11-р сар");
         test.equal(value[11], "12-р сар");
-        
+
         test.done();
     },
     testMonthTranslate_es_CA: function(test) {
@@ -5225,7 +5225,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "octubre");
         test.equal(value[10], "noviembre");
         test.equal(value[11], "diciembre");
-        
+
         test.done();
     },
     testMonthTranslate_af_ZA: function(test) {
@@ -5270,7 +5270,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Okt.");
         test.equal(value[10], "Nov.");
         test.equal(value[11], "Des.");
-        
+
         test.done();
     },
     testMonthTranslate_am_ET: function(test) {
@@ -5314,7 +5314,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "ሰኔ");
         test.equal(value[10], "ሐምሌ");
         test.equal(value[11], "ነሐሴ");
-        test.equal(value[12], "ጳጉሜን");        
+        test.equal(value[12], "ጳጉሜን");
         test.done();
     },
     testMonthTranslate_ha_Latn_NG: function(test) {
@@ -5359,7 +5359,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Okt");
         test.equal(value[10], "Nuw");
         test.equal(value[11], "Dis");
-        
+
         test.done();
     },
     testMonthTranslate_or_IN: function(test) {
@@ -5392,7 +5392,7 @@ module.exports.testmonthtranslation = {
         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],"ମାର୍ଚ୍ଚ");
@@ -5405,7 +5405,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9],"ଅକ୍ଟୋବର");
         test.equal(value[10], "ନଭେମ୍ବର");
         test.equal(value[11],"ଡିସେମ୍ବର");
-        
+
         test.done();
     },
     testMonthTranslate_az_Latn_AZ: function(test) {
@@ -5420,9 +5420,9 @@ module.exports.testmonthtranslation = {
         for (i=0; i < 12; i++) {
             value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"}));
         }
-        test.equal(value[0], "Yanvar");
+        test.equal(value[0], 'yanvar');
         test.equal(value[1], "Fevral");
-        test.equal(value[2], "Mart");
+        test.equal(value[2], 'mart');
         test.equal(value[3], "Aprel");
         test.equal(value[4], "May");
         test.equal(value[5], "İyun");
@@ -5431,7 +5431,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[8], "Sentyabr");
         test.equal(value[9], "Oktyabr");
         test.equal(value[10], "Noyabr");
-        test.equal(value[11], "Dekabr");
+        test.equal(value[11], 'dekabr');
 
         var fmt = new DateFmt({locale:"az-Latn-AZ", date:"m", length: "medium", useNative:false, timezone:"local"})
 
@@ -5450,7 +5450,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "okt");
         test.equal(value[10], "noy");
         test.equal(value[11], "dek");
-        
+
         test.done();
     },
     testMonthTranslate_km_KH: function(test) {
@@ -5495,7 +5495,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "តុលា");
         test.equal(value[10], "វិច្ឆិកា");
         test.equal(value[11], "ធ្នូ");
-        
+
         test.done();
     },
     testMonthTranslate_si_LK: function(test) {
@@ -5540,7 +5540,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "ඔක්");
         test.equal(value[10], "නොවැ");
         test.equal(value[11], "දෙසැ");
-        
+
         test.done();
     },
     testMonthTranslate_ar_AE: function(test) {
@@ -5567,7 +5567,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_BH: function(test) {
@@ -5594,7 +5594,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_DJ: function(test) {
@@ -5621,7 +5621,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_DZ: function(test) {
@@ -5648,7 +5648,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_JO: function(test) {
@@ -5675,7 +5675,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "تشرين الأول");
         test.equal(value[10], "تشرين الثاني");
         test.equal(value[11], "كانون الأول");
-        
+
         test.done();
     },
     testMonthTranslate_ar_KW: function(test) {
@@ -5702,7 +5702,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_LB: function(test) {
@@ -5729,7 +5729,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "تشرين الأول");
         test.equal(value[10], "تشرين الثاني");
         test.equal(value[11],"كانون الأول");
-        
+
         test.done();
     },
     testMonthTranslate_ar_LY: function(test) {
@@ -5756,7 +5756,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_MR: function(test) {
@@ -5783,7 +5783,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "دجمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_OM: function(test) {
@@ -5810,7 +5810,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_QA: function(test) {
@@ -5837,7 +5837,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_SA: function(test) {
@@ -5864,7 +5864,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_SD: function(test) {
@@ -5891,7 +5891,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_SY: function(test) {
@@ -5918,7 +5918,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "تشرين الأول");
         test.equal(value[10], "تشرين الثاني");
         test.equal(value[11], "كانون الأول");
-        
+
         test.done();
     },
     testMonthTranslate_ar_TN: function(test) {
@@ -5945,7 +5945,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_ar_YE: function(test) {
@@ -5972,7 +5972,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "أكتوبر");
         test.equal(value[10], "نوفمبر");
         test.equal(value[11], "ديسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_en_ET: function(test) {
@@ -6018,7 +6018,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[10], "Hamle");
         test.equal(value[11], "Nehasse");
         test.equal(value[12], "Pagumen");
-        
+
         test.done();
     },
     testMonthTranslate_en_GM: function(test) {
@@ -6042,7 +6042,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_LR: function(test) {
@@ -6065,7 +6065,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_PK: function(test) {
@@ -6088,7 +6088,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_RW: function(test) {
@@ -6111,7 +6111,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_SD: function(test) {
@@ -6134,7 +6134,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_SL: function(test) {
@@ -6157,7 +6157,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_en_TZ: function(test) {
@@ -6180,7 +6180,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "October");
         test.equal(value[10], "November");
         test.equal(value[11], "December");
-        
+
         test.done();
     },
     testMonthTranslate_es_CR: function(test) {
@@ -6225,7 +6225,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_GQ: function(test) {
@@ -6266,7 +6266,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_es_PH: function(test) {
@@ -6307,7 +6307,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "dic.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_BF: function(test) {
@@ -6352,7 +6352,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_BJ: function(test) {
@@ -6433,12 +6433,12 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_CF: function(test) {
         test.expect(24);
-        
+
         var value = [], i;
         var fmt = new DateFmt({locale:"fr-CF", date:"m", length: "full", useNative:false, timezone:"local"})
         for (i=0; i < 12; i++) {
@@ -6474,7 +6474,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_CG: function(test) {
@@ -6515,7 +6515,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_CI: function(test) {
@@ -6556,7 +6556,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_CM: function(test) {
@@ -6597,7 +6597,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_GQ: function(test) {
@@ -6638,7 +6638,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_DJ: function(test) {
@@ -6679,7 +6679,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_DZ: function(test) {
@@ -6720,7 +6720,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_GA: function(test) {
@@ -6761,7 +6761,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_GN: function(test) {
@@ -6802,7 +6802,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_LB: function(test) {
@@ -6843,7 +6843,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_ML: function(test) {
@@ -6884,7 +6884,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_RW: function(test) {
@@ -6925,7 +6925,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_SN: function(test) {
@@ -6966,7 +6966,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_fr_TG: function(test) {
@@ -7007,7 +7007,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "oct.");
         test.equal(value[10], "nov.");
         test.equal(value[11], "déc.");
-        
+
         test.done();
     },
     testMonthTranslate_ms_Latn_SG: function(test) {
@@ -7052,7 +7052,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "Okt");
         test.equal(value[10], "Nov");
         test.equal(value[11], "Dis");
-        
+
         test.done();
     },
     testMonthTranslate_pa_PK: function(test) {
@@ -7097,7 +7097,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "ਅਕਤੂ");
         test.equal(value[10], "ਨਵੰ");
         test.equal(value[11], "ਦਸੰ");
-        
+
         test.done();
     },
     testMonthTranslate_pt_AO: function(test) {
@@ -7124,7 +7124,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "outubro");
         test.equal(value[10], "novembro");
         test.equal(value[11], "dezembro");
-        
+
         test.done();
     },
     testMonthTranslate_pt_GQ: function(test) {
@@ -7151,7 +7151,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "outubro");
         test.equal(value[10], "novembro");
         test.equal(value[11], "dezembro");
-        
+
         test.done();
     },
     testMonthTranslate_pt_CV: function(test) {
@@ -7178,7 +7178,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "outubro");
         test.equal(value[10], "novembro");
         test.equal(value[11], "dezembro");
-        
+
         test.done();
     },
     testMonthTranslate_ur_PK: function(test) {
@@ -7223,7 +7223,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "اکتوبر");
         test.equal(value[10], "نومبر");
         test.equal(value[11], "دسمبر");
-        
+
         test.done();
     },
     testMonthTranslate_zh_Hans_SG: function(test) {
@@ -7246,7 +7246,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10月");
         test.equal(value[10], "11月");
         test.equal(value[11], "12月");
-        
+
         test.done();
     },
     testMonthTranslate_zh_Hans_MY: function(test) {
@@ -7269,7 +7269,7 @@ module.exports.testmonthtranslation = {
         test.equal(value[9], "10月");
         test.equal(value[10], "11月");
         test.equal(value[11], "12月");
-        
+
         test.done();
     },
     testMonthTranslate_ka_GE: function(test) {
diff --git a/js/test/date/testWeekdayTranslation.js b/js/test/date/testWeekdayTranslation.js
index 4e9a8b6e83..ff7f370ff3 100644
--- a/js/test/date/testWeekdayTranslation.js
+++ b/js/test/date/testWeekdayTranslation.js
@@ -32,7 +32,7 @@ module.exports.testWeekdayTranslation = {
     },
     testWeekdayTranslation_ar_EG: function(test) {
         test.expect(28);
-        
+
         // full -> wide, long -> abbreviate
         // medium -> short
         // short: narrow
@@ -67,7 +67,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -86,7 +86,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
 
         test.done();
@@ -125,7 +125,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -138,7 +138,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ح");
         test.equal(value[1], "ن");
         test.equal(value[2], "ث");
@@ -157,7 +157,7 @@ module.exports.testWeekdayTranslation = {
         // short: narrow
         var fmt, value = [], i;
         fmt = new DateFmt({locale:"ar-MA", date:"w", length: "full", useNative:false, timezone:"local"});
-        
+
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
@@ -185,7 +185,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -204,7 +204,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
 
         test.done();
@@ -267,7 +267,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ব");
         test.equal(value[5], "শ");
         test.equal(value[6], "শ");
-        
+
         test.done();
     },
     testWeekdayTranslation_bg_BG: function(test) {
@@ -377,10 +377,10 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "বৃ");
         test.equal(value[5], "শু");
         test.equal(value[6], "শ");
-        
+
         test.done();
     },
-    
+
     testWeekdayTranslation_bs_Latn_BA: function(test) {
         test.expect(28);
         var fmt, value = [], i;
@@ -434,7 +434,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Č");
         test.equal(value[5], "P");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_bs_Latn_ME: function(test) {
@@ -447,7 +447,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "nedjelja");
         test.equal(value[1], "ponedjeljak");
         test.equal(value[2], "utorak");
@@ -494,7 +494,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Č");
         test.equal(value[5], "P");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_cs_CZ: function(test) {
@@ -551,7 +551,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Č");
         test.equal(value[5], "P");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_da_DK: function(test) {
@@ -604,7 +604,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "S");
         test.equal(value[1], "M");
         test.equal(value[2], "T");
@@ -612,7 +612,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "L");
-        
+
         test.done();
     },
     testWeekdayTranslation_de_AT: function(test) {
@@ -669,7 +669,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "D");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_de_CH: function(test) {
@@ -727,7 +727,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "D");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_de_DE: function(test) {
@@ -841,7 +841,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "D");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_el_CY: function(test) {
@@ -894,7 +894,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Κ");
         test.equal(value[1], "Δ");
         test.equal(value[2], "Τ");
@@ -902,7 +902,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Π");
         test.equal(value[5], "Π");
         test.equal(value[6], "Σ");
-        
+
         test.done();
     },
     testWeekdayTranslation_el_GR: function(test) {
@@ -929,7 +929,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "Κυρ");
         test.equal(value[1], "Δευ");
         test.equal(value[2], "Τρί");
@@ -963,7 +963,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Π");
         test.equal(value[5], "Π");
         test.equal(value[6], "Σ");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_AM: function(test) {
@@ -1023,7 +1023,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_AU: function(test) {
@@ -1083,7 +1083,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Th.");
         test.equal(value[5], "F.");
         test.equal(value[6], "Sa.");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_AZ: function(test) {
@@ -1139,7 +1139,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_CA: function(test) {
@@ -1199,7 +1199,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_GB: function(test) {
@@ -1259,7 +1259,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_GH: function(test) {
@@ -1318,7 +1318,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_HK: function(test) {
@@ -1378,7 +1378,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_IE: function(test) {
@@ -1438,7 +1438,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_IN: function(test) {
@@ -1498,7 +1498,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_IS: function(test) {
@@ -1613,7 +1613,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_KE: function(test) {
@@ -1672,7 +1672,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_KR: function(test) {
@@ -1730,7 +1730,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_LK: function(test) {
@@ -1789,7 +1789,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_MM: function(test) {
@@ -1847,7 +1847,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_MW: function(test) {
@@ -1906,7 +1906,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_MY: function(test) {
@@ -1965,7 +1965,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_NG: function(test) {
@@ -2083,7 +2083,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_PH: function(test) {
@@ -2143,7 +2143,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_PR: function(test) {
@@ -2263,7 +2263,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_US: function(test) {
@@ -2322,10 +2322,10 @@ module.exports.testWeekdayTranslation = {
 
         test.done();
     },
-   
+
     testWeekdayTranslation_en_UG: function(test) {
         test.expect(28);
-        
+
         // full -> wide, long -> abbreviate
         // medium: short
         // short: narrow
@@ -2380,7 +2380,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_ZA: function(test) {
@@ -2440,7 +2440,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_ZM: function(test) {
@@ -2500,9 +2500,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
-    }, 
+    },
     testWeekdayTranslation_es_AR: function(test) {
         test.expect(28);
         var fmt, value = [], i;
@@ -2560,10 +2560,10 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
-    
+
     testWeekdayTranslation_es_BO: function(test) {
         test.expect(28);
         var fmt, value = [], i;
@@ -2731,7 +2731,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "D");
         test.equal(value[1], "L");
         test.equal(value[2], "M");
@@ -2739,7 +2739,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_DO: function(test) {
@@ -2799,7 +2799,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
 
@@ -2979,7 +2979,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_HN: function(test) {
@@ -3039,7 +3039,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_MX: function(test) {
@@ -3079,13 +3079,13 @@ module.exports.testWeekdayTranslation = {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
 
-        test.equal(value[0], "do");
-        test.equal(value[1], "lu");
-        test.equal(value[2], "ma");
-        test.equal(value[3], "mi");
-        test.equal(value[4], "ju");
-        test.equal(value[5], "vi");
-        test.equal(value[6], "sá");
+        test.equal(value[0], 'DO');
+        test.equal(value[1], 'LU');
+        test.equal(value[2], 'MA');
+        test.equal(value[3], 'MI');
+        test.equal(value[4], 'JU');
+        test.equal(value[5], 'VI');
+        test.equal(value[6], 'SA');
 
         fmt = new DateFmt({locale:"es-MX", date:"w", length: "short", useNative:false, timezone:"local"});
         for (i=0; i < 7; i++) {
@@ -3099,7 +3099,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_NI: function(test) {
@@ -3159,7 +3159,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_PA: function(test) {
@@ -3219,7 +3219,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_PE: function(test) {
@@ -3279,7 +3279,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_PR: function(test) {
@@ -3339,7 +3339,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_PY: function(test) {
@@ -3399,7 +3399,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_SV: function(test) {
@@ -3459,7 +3459,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_US: function(test) {
@@ -3519,7 +3519,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_UY: function(test) {
@@ -3578,7 +3578,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_VE: function(test) {
@@ -3637,10 +3637,10 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
-    
+
     testWeekdayTranslation_et_EE: function(test) {
         test.expect(28);
         var fmt, value = [], i;
@@ -3698,7 +3698,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "N");
         test.equal(value[5], "R");
         test.equal(value[6], "L");
-        
+
         test.done();
     },
     testWeekdayTranslation_fa_AF: function(test) {
@@ -3766,10 +3766,10 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "پ");
         test.equal(value[5], "ج");
         test.equal(value[6], "ش");
-        
+
         test.done();
     },
-    
+
     testWeekdayTranslation_fa_IR: function(test) {
         test.expect(35);
         var fmt, value = [], i;
@@ -3841,7 +3841,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "پ");
         test.equal(value[5], "ج");
         test.equal(value[6], "ش");
-        
+
         test.done();
     },
     testWeekdayTranslation_fi_FI: function(test) {
@@ -3855,7 +3855,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        //standAlone 
+        //standAlone
         test.equal(value[0], "sunnuntai");
         test.equal(value[1], "maanantai");
         test.equal(value[2], "tiistai");
@@ -3902,7 +3902,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "P");
         test.equal(value[6], "L");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_BE: function(test) {
@@ -3962,7 +3962,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_CA: function(test) {
@@ -4080,7 +4080,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_FR: function(test) {
@@ -4140,7 +4140,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_LU: function(test) {
@@ -4259,7 +4259,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "D");
         test.equal(value[5], "A");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_gu_IN: function(test) {
@@ -4316,7 +4316,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4],  "ગુ");
         test.equal(value[5], "શુ");
         test.equal(value[6], "શ");
-        
+
         test.done();
     },
     testWeekdayTranslation_he_IL: function(test) {
@@ -4373,7 +4373,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ה׳");
         test.equal(value[5], "ו׳");
         test.equal(value[6], "ש׳");
-        
+
         test.done();
     },
     testWeekdayTranslation_hi_IN: function(test) {
@@ -4430,7 +4430,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "गु");
         test.equal(value[5], "शु");
         test.equal(value[6], "श");
-        
+
         test.done();
     },
     testWeekdayTranslation_hr_HR: function(test) {
@@ -4486,7 +4486,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "č");
         test.equal(value[5], "p");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_hr_ME: function(test) {
@@ -4541,7 +4541,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "č");
         test.equal(value[5], "p");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_hr_HU: function(test) {
@@ -4596,7 +4596,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "č");
         test.equal(value[5], "p");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_id_ID: function(test) {
@@ -4678,7 +4678,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "fimmtudagur");
         test.equal(value[5], "föstudagur");
         test.equal(value[6], "laugardagur");
-        
+
         fmt = new DateFmt({locale:"is-IS", date:"w", length: "long", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
@@ -4714,7 +4714,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "F");
         test.equal(value[5], "F");
         test.equal(value[6], "L");
-        
+
         test.done();
     },
     testWeekdayTranslation_it_CH: function(test) {
@@ -4881,7 +4881,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "木");
         test.equal(value[5], "金");
         test.equal(value[6], "土");
-        
+
         test.done();
     },
     testWeekdayTranslation_kk_KZ: function(test) {
@@ -4938,7 +4938,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Б");
         test.equal(value[5], "Ж");
         test.equal(value[6], "С");
-        
+
         test.done();
     },
     testWeekdayTranslation_kn_IN: function(test) {
@@ -4998,7 +4998,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ಗು");
         test.equal(value[5], "ಶು");
         test.equal(value[6], "ಶ");
-        
+
         test.done();
     },
     testWeekdayTranslation_ko_KR: function(test) {
@@ -5168,7 +5168,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "K");
         test.equal(value[5], "P");
         test.equal(value[6], "Š");
-        
+
         test.done();
     },
     testWeekdayTranslation_lv_LV: function(test) {
@@ -5224,7 +5224,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "C");
         test.equal(value[5], "P");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_mk_MK: function(test) {
@@ -5281,7 +5281,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ч");
         test.equal(value[5], "п");
         test.equal(value[6], "с");
-        
+
         test.done();
     },
     testWeekdayTranslation_ml_IN: function(test) {
@@ -5302,7 +5302,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "വ്യാഴാഴ്‌ച");
         test.equal(value[5], "വെള്ളിയാഴ്‌ച");
         test.equal(value[6], "ശനിയാഴ്‌ച");
-        
+
         fmt = new DateFmt({locale:"ml-IN", date:"w", length: "long", useNative:false, timezone:"local"});
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
@@ -5678,7 +5678,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ਵੀ");
         test.equal(value[5], "ਸ਼ੁੱ");
         test.equal(value[6], "ਸ਼");
-        
+
         test.done();
     },
     testWeekdayTranslation_pl_PL: function(test) {
@@ -5692,7 +5692,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "niedziela");
         test.equal(value[1], "poniedziałek");
         test.equal(value[2], "wtorek");
@@ -5737,7 +5737,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "C");
         test.equal(value[5], "P");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_pt_BR: function(test) {
@@ -5761,25 +5761,25 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dom");
-        test.equal(value[1], "seg");
-        test.equal(value[2], "ter");
-        test.equal(value[3], "qua");
-        test.equal(value[4], "qui");
-        test.equal(value[5], "sex");
-        test.equal(value[6], "sáb");
+        test.equal(value[0], 'dom.');
+        test.equal(value[1], 'seg.');
+        test.equal(value[2], 'ter.');
+        test.equal(value[3], 'qua.');
+        test.equal(value[4], 'qui.');
+        test.equal(value[5], 'sex.');
+        test.equal(value[6], 'sáb.');
 
         fmt = new DateFmt({locale:"pt-BR", date:"w", length: "medium", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dom");
-        test.equal(value[1], "seg");
-        test.equal(value[2], "ter");
-        test.equal(value[3], "qua");
-        test.equal(value[4], "qui");
-        test.equal(value[5], "sex");
-        test.equal(value[6], "sáb");
+        test.equal(value[0], 'dom.');
+        test.equal(value[1], 'seg.');
+        test.equal(value[2], 'ter.');
+        test.equal(value[3], 'qua.');
+        test.equal(value[4], 'qui.');
+        test.equal(value[5], 'sex.');
+        test.equal(value[6], 'sáb.');
 
         fmt = new DateFmt({locale:"pt-BR", date:"w", length: "short", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
@@ -5792,7 +5792,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Q");
         test.equal(value[5], "S");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_pt_PT: function(test) {
@@ -5830,13 +5830,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dom");
-        test.equal(value[1], "seg");
-        test.equal(value[2], "ter");
-        test.equal(value[3], "qua");
-        test.equal(value[4], "qui");
-        test.equal(value[5], "sex");
-        test.equal(value[6], "sáb");
+        test.equal(value[0], 'domingo');
+        test.equal(value[1], 'segunda');
+        test.equal(value[2], 'terça');
+        test.equal(value[3], 'quarta');
+        test.equal(value[4], 'quinta');
+        test.equal(value[5], 'sexta');
+        test.equal(value[6], 'sábado');
 
         fmt = new DateFmt({locale:"pt-PT", date:"w", length: "short", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
@@ -5906,7 +5906,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_sr_Cyrl_RS: function(test) {
@@ -6020,7 +6020,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "č");
         test.equal(value[5], "p");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_ru_BY: function(test) {
@@ -6078,7 +6078,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Ч");
         test.equal(value[5], "П");
         test.equal(value[6], "С");
-        
+
         test.done();
     },
     testWeekdayTranslation_ru_KG: function(test) {
@@ -6137,7 +6137,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Ч");
         test.equal(value[5], "П");
         test.equal(value[6], "С");
-        
+
         test.done();
     },
     testWeekdayTranslation_ru_KZ: function(test) {
@@ -6195,7 +6195,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Ч");
         test.equal(value[5], "П");
         test.equal(value[6], "С");
-        
+
         test.done();
     },
     testWeekdayTranslation_ru_GE: function(test) {
@@ -6251,7 +6251,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Ч");
         test.equal(value[5], "П");
         test.equal(value[6], "С");
-        
+
         test.done();
     },
     testWeekdayTranslation_ru_RU: function(test) {
@@ -6309,7 +6309,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Ч");
         test.equal(value[5], "П");
         test.equal(value[6], "С");
-        
+
         test.done();
     },
     testWeekdayTranslation_ru_UA: function(test) {
@@ -6538,7 +6538,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "e");
         test.equal(value[5], "p");
         test.equal(value[6], "sh");
-        
+
         test.done();
     },
     testWeekdayTranslation_sq_ME: function(test) {
@@ -6596,7 +6596,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "e");
         test.equal(value[5], "p");
         test.equal(value[6], "sh");
-        
+
         test.done();
     },
     testWeekdayTranslation_sv_FI: function(test) {
@@ -6653,7 +6653,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "L");
-        
+
         test.done();
     },
     testWeekdayTranslation_sv_SE: function(test) {
@@ -6792,7 +6792,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ఆది");
         test.equal(value[1], "సోమ");
         test.equal(value[2], "మంగళ");
@@ -6817,7 +6817,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ఆ");
         test.equal(value[1], "సో");
         test.equal(value[2], "మ");
@@ -6994,7 +6994,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "P");
         test.equal(value[5], "C");
         test.equal(value[6], "C");
-        
+
         test.done();
     },
     testWeekdayTranslation_tr_CY: function(test) {
@@ -7051,7 +7051,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "P");
         test.equal(value[5], "C");
         test.equal(value[6], "C");
-        
+
         test.done();
     },
     testWeekdayTranslation_tr_TR: function(test) {
@@ -7164,7 +7164,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Ч");
         test.equal(value[5], "П");
         test.equal(value[6], "С");
-        
+
         test.done();
     },
     testWeekdayTranslation_ur_IN: function(test) {
@@ -7224,7 +7224,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], 'T');
         test.equal(value[5], 'F');
         test.equal(value[6], 'S');
-       
+
         test.done();
     },
     testWeekdayTranslation_uz_Latn_UZ: function(test) {
@@ -7280,7 +7280,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "P");
         test.equal(value[5], "J");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_vi_VN: function(test) {
@@ -7301,7 +7301,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Thứ Năm");
         test.equal(value[5], "Thứ Sáu");
         test.equal(value[6], "Thứ Bảy");
-        
+
         fmt = new DateFmt({locale:"vi-VN", date:"w", length: "long", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
@@ -7325,7 +7325,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T5");
         test.equal(value[5], "T6");
         test.equal(value[6], "T7");
-        
+
         fmt = new DateFmt({locale:"vi-VN", date:"w", length: "short", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
@@ -7391,7 +7391,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "四");
         test.equal(value[5], "五");
         test.equal(value[6], "六");
-        
+
         test.done();
     },
     testWeekdayTranslation_zh_Hant_HK: function(test) {
@@ -7444,7 +7444,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "四");
         test.equal(value[5], "五");
         test.equal(value[6], "六");
-        
+
         test.done();
     },
     testWeekdayTranslation_zh_Hant_TW: function(test) {
@@ -7497,7 +7497,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "四");
         test.equal(value[5], "五");
         test.equal(value[6], "六");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_GE: function(test) {
@@ -7553,7 +7553,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_CN: function(test) {
@@ -7608,8 +7608,8 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[3], "W");
         test.equal(value[4], "T");
         test.equal(value[5], "F");
-        test.equal(value[6], "S");        
-        
+        test.equal(value[6], "S");
+
         test.done();
     },
     testWeekdayTranslation_en_MX: function(test) {
@@ -7664,8 +7664,8 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[3], "W");
         test.equal(value[4], "T");
         test.equal(value[5], "F");
-        test.equal(value[6], "S");        
-        
+        test.equal(value[6], "S");
+
         test.done();
     },
     testWeekdayTranslation_en_TW: function(test) {
@@ -7720,8 +7720,8 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[3], "W");
         test.equal(value[4], "T");
         test.equal(value[5], "F");
-        test.equal(value[6], "S");        
-        
+        test.equal(value[6], "S");
+
         test.done();
     },
     testWeekdayTranslation_mn_MN: function(test) {
@@ -7778,7 +7778,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Пү");
         test.equal(value[5], "Ба");
         test.equal(value[6], "Бя");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_CA: function(test) {
@@ -7837,7 +7837,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_af_ZA: function(test) {
@@ -7893,7 +7893,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "D");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_am_ET: function(test) {
@@ -7943,7 +7943,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 13; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+7, type:"ethiopic"}));
         }
-        
+
         test.equal(value[0], "እ");
         test.equal(value[1], "ሰ");
         test.equal(value[2], "ማ");
@@ -8009,7 +8009,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[5], "J");
         test.equal(value[6], "A");
 
-        
+
         test.done();
     },
     testWeekdayTranslation_or_IN: function(test) {
@@ -8034,7 +8034,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ରବି");
         test.equal(value[1], "ସୋମ");
         test.equal(value[2], "ମଙ୍ଗଳ");
@@ -8059,7 +8059,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "ର");
         test.equal(value[1], "ସୋ");
         test.equal(value[2], "ମ");
@@ -8067,7 +8067,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ଗୁ");
         test.equal(value[5], "ଶୁ");
         test.equal(value[6], "ଶ");
-        
+
         test.done();
     },
     testWeekdayTranslation_az_Latn_AZ: function(test) {
@@ -8124,7 +8124,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "4");
         test.equal(value[5], "5");
         test.equal(value[6], "6");
-        
+
         test.done();
     },
     testWeekdayTranslation_km_KH: function(test) {
@@ -8181,7 +8181,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ព");
         test.equal(value[5], "ស");
         test.equal(value[6], "ស");
-        
+
         test.done();
     },
     testWeekdayTranslation_si_LK: function(test) {
@@ -8238,7 +8238,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "බ්‍ර");
         test.equal(value[5], "සි");
         test.equal(value[6], "සෙ");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_AE: function(test) {
@@ -8275,7 +8275,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8294,9 +8294,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_BH: function(test) {
@@ -8334,7 +8334,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8353,9 +8353,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_DJ: function(test) {
@@ -8389,7 +8389,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8408,9 +8408,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_DZ: function(test) {
@@ -8449,7 +8449,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8468,9 +8468,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_JO: function(test) {
@@ -8509,7 +8509,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8528,7 +8528,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
         test.done();
     },
@@ -8568,7 +8568,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8587,9 +8587,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_LB: function(test) {
@@ -8628,7 +8628,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8647,9 +8647,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_LY: function(test) {
@@ -8687,7 +8687,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8706,9 +8706,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_MR: function(test) {
@@ -8745,7 +8745,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8764,9 +8764,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_OM: function(test) {
@@ -8803,7 +8803,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8822,7 +8822,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
 
         test.done();
@@ -8862,7 +8862,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8881,9 +8881,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_SA: function(test) {
@@ -8921,7 +8921,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8940,9 +8940,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_SD: function(test) {
@@ -8980,7 +8980,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -8999,9 +8999,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_SY: function(test) {
@@ -9039,7 +9039,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -9058,7 +9058,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
 
         test.done();
@@ -9098,7 +9098,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -9117,9 +9117,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_ar_YE: function(test) {
@@ -9157,7 +9157,7 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        
+
         test.equal(value[0], "أحد");
         test.equal(value[1], "إثنين");
         test.equal(value[2], "ثلاثاء");
@@ -9176,9 +9176,9 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[2], "ث");
         test.equal(value[3], "ر");
         test.equal(value[4], "خ");
-        test.equal(value[5], "ج"); 
+        test.equal(value[5], "ج");
         test.equal(value[6], "س");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_ET: function(test) {
@@ -9238,7 +9238,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[6], "K");
 
         test.done();
-    }, 
+    },
     testWeekdayTranslation_en_GM: function(test) {
         test.expect(28);
         var fmt, value = [], i;
@@ -9402,7 +9402,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_RW: function(test) {
@@ -9458,7 +9458,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_SD: function(test) {
@@ -9514,7 +9514,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_SL: function(test) {
@@ -9570,7 +9570,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_en_TZ: function(test) {
@@ -9626,7 +9626,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "T");
         test.equal(value[5], "F");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_CR: function(test) {
@@ -9686,7 +9686,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "j");
         test.equal(value[5], "v");
         test.equal(value[6], "s");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_GQ: function(test) {
@@ -9742,7 +9742,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_es_PH: function(test) {
@@ -9798,7 +9798,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_BF: function(test) {
@@ -9855,7 +9855,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_BJ: function(test) {
@@ -9961,7 +9961,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_CF: function(test) {
@@ -10067,7 +10067,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_CI: function(test) {
@@ -10120,7 +10120,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_CM: function(test) {
@@ -10173,7 +10173,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_GQ: function(test) {
@@ -10226,7 +10226,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_DJ: function(test) {
@@ -10279,7 +10279,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_DZ: function(test) {
@@ -10332,7 +10332,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_GA: function(test) {
@@ -10385,7 +10385,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_GN: function(test) {
@@ -10438,7 +10438,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_LB: function(test) {
@@ -10491,7 +10491,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_ML: function(test) {
@@ -10544,7 +10544,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_RW: function(test) {
@@ -10597,7 +10597,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_SN: function(test) {
@@ -10650,7 +10650,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_fr_TG: function(test) {
@@ -10703,7 +10703,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "J");
         test.equal(value[5], "V");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_ms_Latn_SG: function(test) {
@@ -10760,7 +10760,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "K");
         test.equal(value[5], "J");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_pa_PK: function(test) {
@@ -10817,7 +10817,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "ਵੀ");
         test.equal(value[5], "ਸ਼ੁੱ");
         test.equal(value[6], "ਸ਼");
-        
+
         test.done();
     },
     testWeekdayTranslation_pt_AO: function(test) {
@@ -10854,13 +10854,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dom");
-        test.equal(value[1], "seg");
-        test.equal(value[2], "ter");
-        test.equal(value[3], "qua");
-        test.equal(value[4], "qui");
-        test.equal(value[5], "sex");
-        test.equal(value[6], "sáb");
+        test.equal(value[0], 'domingo');
+        test.equal(value[1], 'segunda');
+        test.equal(value[2], 'terça');
+        test.equal(value[3], 'quarta');
+        test.equal(value[4], 'quinta');
+        test.equal(value[5], 'sexta');
+        test.equal(value[6], 'sábado');
 
         fmt = new DateFmt({locale:"pt-AO", date:"w", length: "short", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
@@ -10873,7 +10873,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Q");
         test.equal(value[5], "S");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_pt_GQ: function(test) {
@@ -10911,13 +10911,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dom");
-        test.equal(value[1], "seg");
-        test.equal(value[2], "ter");
-        test.equal(value[3], "qua");
-        test.equal(value[4], "qui");
-        test.equal(value[5], "sex");
-        test.equal(value[6], "sáb");
+        test.equal(value[0], 'domingo');
+        test.equal(value[1], 'segunda');
+        test.equal(value[2], 'terça');
+        test.equal(value[3], 'quarta');
+        test.equal(value[4], 'quinta');
+        test.equal(value[5], 'sexta');
+        test.equal(value[6], 'sábado');
 
         fmt = new DateFmt({locale:"pt-GQ", date:"w", length: "short", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
@@ -10930,7 +10930,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "Q");
         test.equal(value[5], "S");
         test.equal(value[6], "S");
-        
+
         test.done();
     },
     testWeekdayTranslation_pt_CV: function(test) {
@@ -10968,13 +10968,13 @@ module.exports.testWeekdayTranslation = {
         for (i=0; i < 7; i++) {
             value[i] = fmt.format(DateFactory({year: 2015, month: 8, day:i+2, type:"gregorian"}));
         }
-        test.equal(value[0], "dom");
-        test.equal(value[1], "seg");
-        test.equal(value[2], "ter");
-        test.equal(value[3], "qua");
-        test.equal(value[4], "qui");
-        test.equal(value[5], "sex");
-        test.equal(value[6], "sáb");
+        test.equal(value[0], 'domingo');
+        test.equal(value[1], 'segunda');
+        test.equal(value[2], 'terça');
+        test.equal(value[3], 'quarta');
+        test.equal(value[4], 'quinta');
+        test.equal(value[5], 'sexta');
+        test.equal(value[6], 'sábado');
 
         fmt = new DateFmt({locale:"pt-CV", date:"w", length: "short", useNative:false, timezone:"local"})
         for (i=0; i < 7; i++) {
@@ -11044,7 +11044,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], 'T');
         test.equal(value[5], 'F');
         test.equal(value[6], 'S');
-        
+
         test.done();
     },
     testWeekdayTranslation_zh_Hans_SG: function(test) {
@@ -11097,7 +11097,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "四");
         test.equal(value[5], "五");
         test.equal(value[6], "六");
-        
+
         test.done();
     },
     testWeekdayTranslation_zh_Hans_MY: function(test) {
@@ -11150,7 +11150,7 @@ module.exports.testWeekdayTranslation = {
         test.equal(value[4], "四");
         test.equal(value[5], "五");
         test.equal(value[6], "六");
-        
+
         test.done();
     },
     testWeekdayTranslationFull_ka_GE: function(test) {
diff --git a/js/test/date/testdatefmt.js b/js/test/date/testdatefmt.js
index 753ffaae04..9b7dbcedaa 100644
--- a/js/test/date/testdatefmt.js
+++ b/js/test/date/testdatefmt.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmt.js - test the date formatter object
- * 
+ *
  * Copyright © 2012-2015,2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@ if (typeof(DateFactory) === "undefined") {
 
 function mockLoaderDF(paths, sync, params, callback) {
     var data = [];
-    
+
     paths.forEach(function(path) {
         if (path === "localeinfo.json") {
             data.push(ilib.data.localeinfo); // for the generic, shared stuff
@@ -61,7 +61,7 @@ function mockLoaderDF(paths, sync, params, callback) {
     });
 
     if (typeof(callback) !== 'undefined') {
-        callback.call(this, data);  
+        callback.call(this, data);
     }
     return data;
 }
@@ -82,57 +82,57 @@ module.exports.testdatefmt = {
     testDateFmtConstructorEmpty: function(test) {
         test.expect(1);
         var fmt = new DateFmt();
-        
+
         test.ok(fmt !== null);
         test.done();
     },
-    
+
     testDateFmtConstructorDefaultLocale: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
-        
+
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLocale().toString(), "en-US");
         test.done();
     },
-    
+
     testDateFmtGetCalendarDefault: function(test) {
         test.expect(3);
         var fmt = new DateFmt();
-        
+
         test.ok(fmt !== null);
         var cal = fmt.getCalendar();
         test.ok(cal !== null);
-        
+
         test.equal(cal, "gregorian");
         test.done();
     },
-    
+
     testDateFmtGetCalendarExplicit: function(test) {
         test.expect(3);
         var fmt = new DateFmt({calendar: "julian"});
-        
+
         test.ok(fmt !== null);
         var cal = fmt.getCalendar();
         test.ok(cal !== null);
-        
+
         test.equal(cal, "julian");
         test.done();
     },
-    
+
     testDateFmtGetCalendarExplicitDefault: function(test) {
         test.expect(3);
         var fmt = new DateFmt({calendar: "gregorian"});
-        
+
         test.ok(fmt !== null);
         var cal = fmt.getCalendar();
         test.ok(cal !== null);
-        
+
         test.equal(cal, "gregorian");
         test.done();
     },
-    
+
     testDateFmtGetCalendarNotInThisLocale: function(test) {
         try {
             new DateFmt({calendar: "arabic", locale: 'en-US'});
@@ -143,308 +143,307 @@ module.exports.testdatefmt = {
         }
         test.done();
     },
-    
+
     testDateFmtGetLength: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
         test.equal(fmt.getLength(), "full");
         test.done();
     },
-    
+
     testDateFmtGetLengthDefault: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLength(), "short");
         test.done();
     },
-    
+
     testDateFmtGetLengthBogus: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "asdf"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLength(), "short");
         test.done();
     },
-    
-    
+
+
     testDateFmtGetType: function(test) {
         test.expect(2);
         var fmt = new DateFmt({type: "time"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getType(), "time");
         test.done();
     },
-    
+
     testDateFmtGetTypeDefault: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getType(), "date");
         test.done();
     },
-    
+
     testDateFmtGetTypeBogus: function(test) {
         test.expect(2);
         var fmt = new DateFmt({type: "asdf"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getType(), "date");
         test.done();
     },
-    
-    
+
+
     testDateFmtGetLocale: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLocale().toString(), "de-DE");
         test.done();
     },
-    
+
     testDateFmtGetLocaleDefault: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLocale().toString(), "en-US");
         test.done();
     },
-    
+
     testDateFmtGetLocaleBogus: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "zyy-XX"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLocale().toString(), "zyy-XX");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponentsDefault: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeComponents(), "ahm");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponents: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: "hmsaz"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeComponents(), "ahmsz");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponentsReorder: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: "zahms"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeComponents(), "ahmsz");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponentsBogus: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: "asdf"});
         test.ok(fmt !== null);
-        
+
         // use the default
         test.equal(fmt.getTimeComponents(), "ahm");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponentsICUSkeleton1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: "EHm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeComponents(), "hm");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponentsICUSkeleton2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: "Hms"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeComponents(), "hms");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponentsICUSkeleton3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: "Ehms"});
         test.ok(fmt !== null);
-        
+
         // ignore the non-time components
         test.equal(fmt.getTimeComponents(), "hms");
         test.done();
     },
-    
+
     testDateFmtGetTimeComponentsICUSkeleton3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: "yMdhms"});
         test.ok(fmt !== null);
-        
+
         // ignore the non-time components
         test.equal(fmt.getTimeComponents(), "hms");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsDefault: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "dmy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponents: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "dmwy"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "dmwy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsReorder: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "wmdy"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "dmwy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsBogus: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "asdf"});
         test.ok(fmt !== null);
-        
+
         // use the default
         test.equal(fmt.getDateComponents(), "dmy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsICUSkeleton1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "yMMMMd"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "dmy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsICUSkeleton2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "yMMd"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "dmy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsICUSkeleton3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "yMMMM"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "my");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsICUSkeleton4: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "MMMEd"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "dmw");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsICUSkeleton5: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "GyMMMEd"});
         test.ok(fmt !== null);
-        
+
         // ignore the era
         test.equal(fmt.getDateComponents(), "dmwy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentsICUSkeleton6: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "MMddhms"});
         test.ok(fmt !== null);
-        
+
         // ignore the time components
         test.equal(fmt.getDateComponents(), "dm");
         test.done();
     },
-    
+
     testDateFmtGetClockDefaultUS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         // use the default
         test.equal(fmt.getClock(), "12");
         test.done();
     },
-    
+
     testDateFmtGetClockDefaultDE: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         // use the default
         test.equal(fmt.getClock(), "24");
         test.done();
     },
-    
+
     testDateFmtGetClockDefaultJP: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "ja-JP"});
         test.ok(fmt !== null);
-        
+
         // use the default
         test.equal(fmt.getClock(), "24");
         test.done();
     },
-    
+
     testDateFmtGetClock: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US", clock: "24"});
         test.ok(fmt !== null);
-        
+
         // use the default
         test.equal(fmt.getClock(), "24");
         test.done();
     },
-    
+
     testDateFmtGetClockBogus: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US", clock: "asdf"});
         test.ok(fmt !== null);
-        
+
         // use the default
         test.equal(fmt.getClock(), "12");
         test.done();
     },
-    
+
     testDateFmtGetTimeZoneDefault: function(test) {
         test.expect(2);
         ilib.tz = undefined;    // just in case
@@ -452,258 +451,258 @@ module.exports.testdatefmt = {
         if (ilib._getPlatform() === "nodejs") {
             process.env.TZ = "";
         }
-        
+
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeZone().getId(), "local");
         test.done();
     },
-    
+
     testDateFmtGetTimeZone: function(test) {
         test.expect(2);
         var fmt = new DateFmt({timezone: "Europe/Paris"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeZone().getId(), "Europe/Paris");
         test.done();
     },
-    
+
     testDateFmtGetTemplateDefault: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "M/d/yy");
         test.done();
     },
-    
+
     testDateFmtGetTemplate: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "EEE 'the' DD 'of' MM, yyyy G");
         test.done();
     },
-    
+
     testDateFmtGetTemplateIgnoreProperties: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: 'y', template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "EEE 'the' DD 'of' MM, yyyy G");
         test.done();
     },
-    
+
     testDateFmtUseTemplateEmptyDateComponents: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: 'y', template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getDateComponents(), "");
         test.done();
     },
-    
+
     testDateFmtUseTemplateEmptyTimeComponents: function(test) {
         test.expect(2);
         var fmt = new DateFmt({time: 'h', template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTimeComponents(), "");
         test.done();
     },
-    
+
     testDateFmtUseTemplateEmptyLength: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: 'short', template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLength(), "");
         test.done();
     },
-    
+
     testDateFmtUseTemplateNonEmptyCalendar: function(test) {
         test.expect(2);
         var fmt = new DateFmt({calendar: 'julian', template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getCalendar(), "julian");
         test.done();
     },
-    
+
     testDateFmtUseTemplateNonEmptyLocale: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: 'de-DE', template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getLocale().toString(), "de-DE");
         test.done();
     },
-    
+
     testDateFmtUseTemplateNonEmptyClock: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "24", template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getClock(), "24");
         test.done();
     },
-    
+
     testDateFmtUseTemplateWithClockHH: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "24", template: "hh:mm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "HH:mm");
         test.done();
     },
-    
+
     testDateFmtUseTemplateWithClockKK: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "24", template: "KK:mm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "kk:mm");
         test.done();
     },
-    
+
     testDateFmtUseTemplateWithClockhh: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "12", template: "HH:mm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "hh:mm");
         test.done();
     },
-    
+
     testDateFmtUseTemplateWithClockkk: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "12", template: "kk:mm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "KK:mm");
         test.done();
     },
-    
+
     testDateFmtUseTemplateWithClockHHSkipEscapedStrings24: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "24", template: "'hh' hh:mm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "'hh' HH:mm");
         test.done();
     },
-    
+
     testDateFmtUseTemplateWithClockHHSkipEscapedStrings12: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "12", template: "'HH' HH:mm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "'HH' hh:mm");
         test.done();
     },
-    
+
     testDateFmtUseTemplateNonEmptyTimeZone: function(test) {
         test.expect(3);
         var fmt = new DateFmt({timezone: 'Europe/Paris', template: "EEE 'the' DD 'of' MM, yyyy G"});
         test.ok(fmt !== null);
-        
+
         var tz = fmt.getTimeZone();
         test.ok(typeof(tz) !== "undefined");
         test.equal(tz.getId(), "Europe/Paris");
         test.done();
     },
-    
+
     testDateFmtGetTemplateCalendar: function(test) {
         test.expect(2);
         var fmt = new DateFmt({calendar: "julian"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "M/d/yy");
         test.done();
     },
-    
+
     testDateFmtGetTemplateLocale: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "dd.MM.yy");
         test.done();
     },
-    
+
     testDateFmtGetTemplateLength: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "long"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "MMMM d, yyyy");
         test.done();
     },
-    
+
     testDateFmtGetTemplateTypeDateTime: function(test) {
         test.expect(2);
         var fmt = new DateFmt({type: "datetime"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "M/d/yy, h:mm a");
         test.done();
     },
-    
+
     testDateFmtGetTemplateTypeTime: function(test) {
         test.expect(2);
         var fmt = new DateFmt({type: "time"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "h:mm a");
         test.done();
     },
-    
+
     testDateFmtGetTemplateDateComponents: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "wdm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "E, M/d");
         test.done();
     },
-    
+
     testDateFmtGetTemplateDateComponentsWithICUSkeleton: function(test) {
         test.expect(2);
         var fmt = new DateFmt({date: "MMMEd"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "E, M/d");
         test.done();
     },
-    
+
     testDateFmtGetTemplateTimeComponents: function(test) {
         test.expect(2);
         var fmt = new DateFmt({type: "time", time: "hm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "h:mm");
         test.done();
     },
-    
+
     testDateFmtGetTemplateTimeComponentsWithICUSkeleton: function(test) {
         test.expect(2);
         var fmt = new DateFmt({type: "time", time: "Hm"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "h:mm");
         test.done();
     },
-    
+
     testDateFmtGetTemplateTypeTime24: function(test) {
         test.expect(2);
         var fmt = new DateFmt({type: "time", clock: "24"});
         test.ok(fmt !== null);
-        
+
         test.equal(fmt.getTemplate(), "HH:mm");
         test.done();
     },
-    
+
     testDateFmtTokenizeSimple: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
@@ -713,11 +712,11 @@ module.exports.testdatefmt = {
             " ",
             "d"
         ];
-        
+
         test.deepEqual(fmt._tokenize("MMM d"), expected);
         test.done();
     },
-    
+
     testDateFmtTokenizeAdjacentParts: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
@@ -728,11 +727,11 @@ module.exports.testdatefmt = {
             "mm",
             "a"
         ];
-        
+
         test.deepEqual(fmt._tokenize("hh:mma"), expected);
         test.done();
     },
-    
+
     testDateFmtTokenizeComplex: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
@@ -753,11 +752,11 @@ module.exports.testdatefmt = {
             " ",
             "z"
         ];
-        
+
         test.deepEqual(fmt._tokenize("dd/MM/yyyy, h:mm:ssa z"), expected);
         test.done();
     },
-    
+
     testDateFmtTokenizeWithEscapes: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
@@ -773,21 +772,21 @@ module.exports.testdatefmt = {
             ", ",
             "yyyy"
         ];
-        
+
         test.deepEqual(fmt._tokenize("'El' d 'de' MMMM, yyyy"), expected);
         test.done();
     },
-    
+
     testDateFmtAlternateInputs1: function(test) {
         // toUTCString doesn't work properly on qt, so we can't do this test
         if (ilib._getPlatform() !== "qt") {
             test.expect(2);
             var fmt = new DateFmt({
-                timezone: "Etc/UTC", 
+                timezone: "Etc/UTC",
                 template: "EEE, d MMM yyyy kk:mm:ss z"
             });
             test.ok(fmt !== null);
-            
+
             var datMyBday = new Date("Fri Aug 13 1982 13:37:35 GMT-0700");
             var ildMyBday = DateFactory({
                 timezone: "Etc/UTC",
@@ -802,12 +801,12 @@ module.exports.testdatefmt = {
             var strFormattedDate2 = fmt.format(ildMyBday);
             strFormattedDate1 = strFormattedDate1.replace(/ \w{3}$/, '');
             strFormattedDate2 = strFormattedDate2.replace(/ \w{3}$/, '');
-        
+
             test.equal(strFormattedDate2, strFormattedDate1);
         }
         test.done();
     },
-    
+
     testDateFmtFormatJSDate1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -816,14 +815,14 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         var datMyBday = new Date("Fri Aug 13 1982 13:37:35 GMT-0700");
         test.equal(fmt.format(datMyBday), "1:37 PM");
         test.done();
     },
-    
+
     testDateFmtFormatJSDateRightTimeZone1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -833,14 +832,14 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         var datMyBday = new Date("Wed May 14 2014 23:37:35 GMT-0700");
         test.equal(fmt.format(datMyBday), "Wednesday");
         test.done();
     },
-    
+
     testDateFmtFormatJSDateRightTimeZone2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -850,14 +849,14 @@ module.exports.testdatefmt = {
             timezone: "America/New_York"
         });
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         var datMyBday = new Date("Wed May 14 2014 23:37:35 GMT-0700");
         test.equal(fmt.format(datMyBday), "Thursday");
         test.done();
     },
-    
+
     testDateFmtFormatJSDateRightTimeZone3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -867,14 +866,14 @@ module.exports.testdatefmt = {
             timezone: "Australia/Perth"
         });
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         var datMyBday = new Date("Wed May 14 2014 20:37:35 GMT");
         test.equal(fmt.format(datMyBday), "Thursday");
         test.done();
     },
-    
+
     testDateFmtFormatJSDateRightTimeZone4: function(test) {
         var d = new Date();
         // test only works in north america
@@ -890,14 +889,14 @@ module.exports.testdatefmt = {
         });
         test.expect(2);
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         var datMyBday = new Date('2014-05-13T03:17:48.674Z');
         test.equal(fmt.format(datMyBday), "Monday");
         test.done();
     },
-    
+
     testDateFmtFormatJSDate2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -906,13 +905,13 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         test.equal(fmt.format(398119055000), "1:37 PM");
         test.done();
     },
-    
+
     testDateFmtFormatJSDateRightTimeZone5: function(test) {
         var d = new Date();
         // test only works in north america
@@ -928,13 +927,13 @@ module.exports.testdatefmt = {
         });
         test.expect(2);
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         test.equal(fmt.format(1399951068674), "Monday");
         test.done();
     },
-    
+
     testDateFmtFormatJSDate3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -943,13 +942,13 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         test.equal(fmt.format("Fri Aug 13 1982 13:37:35 GMT-0700"), "1:37 PM");
         test.done();
     },
-    
+
     testDateFmtFormatJSDateRightTimeZone6: function(test) {
         var d = new Date();
         // test only works in north america
@@ -965,139 +964,139 @@ module.exports.testdatefmt = {
         });
         test.expect(2);
         test.ok(fmt !== null);
-        
-        // test formatting a javascript date. It should be converted to 
+
+        // test formatting a javascript date. It should be converted to
         // an ilib date object automatically and then formatted
         test.equal(fmt.format("Wed May 14 2014 23:37:35 GMT-0700"), "Wednesday");
         test.done();
     },
-    
+
     testDateFmtGetMonthsOfYear1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var arrMonths = fmt.getMonthsOfYear();
         var expected = [undefined, "J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"];
         test.deepEqual(arrMonths, expected);
         test.done();
     },
-    
+
     testDateFmtGetMonthsOfYear2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var arrMonths = fmt.getMonthsOfYear({length: "long"});
         var expected = [undefined, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
         test.deepEqual(arrMonths, expected);
         test.done();
     },
-    
+
     testDateFmtGetMonthsOfYearThai: function(test) {
         test.expect(2);
         // uses ThaiSolar calendar
         var fmt = new DateFmt({locale: "th-TH"});
         test.ok(fmt !== null);
-        
+
         var arrMonths = fmt.getMonthsOfYear({length: "long"});
-        
+
         var expected = [undefined, "ม.ค.", "ก.พ.", "มี.ค.", "เม.ย.", "พ.ค.", "มิ.ย.", "ก.ค.", "ส.ค.", "ก.ย.", "ต.ค.", "พ.ย.", "ธ.ค."];
         test.deepEqual(arrMonths, expected);
         test.done();
     },
-    
+
     testDateFmtGetMonthsOfYearLeapYear: function(test) {
         test.expect(2);
         var d = DateFactory({type: "hebrew", locale: "en-US", year: 5774, month: 1, day: 1});
         var fmt = new DateFmt({date: "en-US", calendar: "hebrew"});
         test.ok(fmt !== null);
-        
+
         var arrMonths = fmt.getMonthsOfYear({length: "long", date: d});
-    
+
         var expected = [undefined, "Nis", "Iyy", "Siv", "Tam", "Av", "Elu", "Tis", "Ḥes", "Kis", "Tev", "She", "Ada", "Ad2"];
         test.deepEqual(arrMonths, expected);
         test.done();
     },
-    
+
     testDateFmtGetMonthsOfYearNonLeapYear: function(test) {
         test.expect(2);
         var d = DateFactory({type: "hebrew", locale: "en-US", year: 5775, month: 1, day: 1});
         var fmt = new DateFmt({date: "en-US", calendar: "hebrew"});
         test.ok(fmt !== null);
-        
+
         var arrMonths = fmt.getMonthsOfYear({length: "long", date: d});
-    
+
         var expected = [undefined, "Nis", "Iyy", "Siv", "Tam", "Av", "Elu", "Tis", "Ḥes", "Kis", "Tev", "She", "Ada"];
         test.deepEqual(arrMonths, expected);
         test.done();
     },
-    
+
     testDateFmtGetDaysOfWeek1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var arrDays = fmt.getDaysOfWeek();
-        
+
         var expected = ["S", "M", "T", "W", "T", "F", "S"];
         test.deepEqual(arrDays, expected);
         test.done();
     },
-    
+
     testDateFmtGetDaysOfWeek2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var arrDays = fmt.getDaysOfWeek({length: 'long'});
         var expected = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
         test.deepEqual(arrDays, expected);
         test.done();
     },
-    
+
     testDateFmtGetDaysOfWeekOtherCalendar: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US", calendar: "hebrew"});
         test.ok(fmt !== null);
-        
+
         var arrDays = fmt.getDaysOfWeek({length: 'long'});
-    
+
         var expected = ["ris", "she", "shl", "rvi", "ḥam", "shi", "sha"];
         test.deepEqual(arrDays, expected);
         test.done();
     },
-    
+
     testDateFmtGetDaysOfWeekThai: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "th-TH", calendar: "thaisolar"});
         test.ok(fmt !== null);
-        
+
         var arrDays = fmt.getDaysOfWeek({length: 'long'});
-    
+
         var expected = ["อา.", "จ.", "อ.", "พ.", "พฤ.", "ศ.", "ส."];
         test.deepEqual(arrDays, expected);
         test.done();
     },
-    
+
     testDateFmtGetDaysOfWeekThaiInEnglish: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "en-US", calendar: "thaisolar"});
         test.ok(fmt !== null);
-        
+
         var arrDays = fmt.getDaysOfWeek({length: 'long'});
-        
+
         var expected = ["ath", "cha", "ang", "phu", "phr", "suk", "sao"];
         test.deepEqual(arrDays, expected);
         test.done();
     },
-    
-    
+
+
     testDateFmtWeekYear1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "w"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 1,
@@ -1110,12 +1109,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "52");
         test.done();
     },
-    
+
     testDateFmtWeekYear2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "w"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 1,
@@ -1128,12 +1127,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
+
     testDateFmtWeekYear3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "w"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2010,
             month: 12,
@@ -1146,12 +1145,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "52");
         test.done();
     },
-    
+
     testDateFmtWeekYear4: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "w"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2009,
             month: 12,
@@ -1164,12 +1163,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "53");
         test.done();
     },
-    
+
     testDateFmtWeekYear5: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "w"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2008,
             month: 12,
@@ -1182,12 +1181,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
+
     testDateFmtWeekYear6: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "w"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2007,
             month: 12,
@@ -1200,12 +1199,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
+
     testDateFmtWeekYearPad: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "ww"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 1,
@@ -1218,12 +1217,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "01");
         test.done();
     },
-    
+
     testDateFmtFormatWithEscapes: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: 'es-MX', template: "'El' dd 'de' MMMM"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "es-MX",
             year: 2011,
@@ -1237,12 +1236,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "El 05 de mayo");
         test.done();
     },
-    
+
     testDateFmtDayOfYearFirstD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "D"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 1,
@@ -1255,12 +1254,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
+
     testDateFmtDayOfYearFirstDD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 1,
@@ -1273,12 +1272,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "01");
         test.done();
     },
-    
+
     testDateFmtDayOfYearFirstDDD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DDD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 1,
@@ -1291,12 +1290,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "001");
         test.done();
     },
-    
+
     testDateFmtDayOfYearLastD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "D"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 12,
@@ -1309,12 +1308,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "365");
         test.done();
     },
-    
+
     testDateFmtDayOfYearLastDD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 12,
@@ -1327,12 +1326,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "365");
         test.done();
     },
-    
+
     testDateFmtDayOfYearLastDLeap: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "D"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2008,
             month: 12,
@@ -1345,12 +1344,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "366");
         test.done();
     },
-    
+
     testDateFmtDayOfYearLastDDD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DDD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 12,
@@ -1363,12 +1362,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "365");
         test.done();
     },
-    
+
     testDateFmtDayOfYearPaddysDayD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "D"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 3,
@@ -1381,12 +1380,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "76");
         test.done();
     },
-    
+
     testDateFmtDayOfYearPaddysDayDD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 3,
@@ -1399,12 +1398,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "76");
         test.done();
     },
-    
+
     testDateFmtDayOfYearPaddysDayDDD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DDD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 3,
@@ -1417,12 +1416,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "076");
         test.done();
     },
-    
+
     testDateFmtDayOfYearPaddysDayDLeap: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "D"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2008,
             month: 3,
@@ -1435,12 +1434,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "77");
         test.done();
     },
-    
+
     testDateFmtDayOfYearPaddysDayDDLeap: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2008,
             month: 3,
@@ -1453,12 +1452,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "77");
         test.done();
     },
-    
+
     testDateFmtDayOfYearPaddysDayDDDLeap: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "DDD"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2008,
             month: 3,
@@ -1471,12 +1470,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "077");
         test.done();
     },
-    
+
     testDateFmtWeekOfMonthUS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "W", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1490,12 +1489,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
+
     testDateFmtWeekOfMonthDE: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "W", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1509,12 +1508,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "0");
         test.done();
     },
-    
+
     testDateFmtWeekOfMonthUSSept: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "W", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1528,12 +1527,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "0");
         test.done();
     },
-    
+
     testDateFmtWeekOfMonthUSOct: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "W", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1547,12 +1546,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "0");
         test.done();
     },
-    
+
     testDateFmtWeekOfMonthUSNov: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "W", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1566,12 +1565,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
+
     testDateFmtWeekOfMonthUSRegular: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "W", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1585,12 +1584,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "4");
         test.done();
     },
-    
+
     testDateFmtWeekOfMonthDERegular: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "W", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1604,12 +1603,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "3");
         test.done();
     },
-    
+
     testDateFmtYear0YY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "yy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 0,
             month: 12,
@@ -1622,12 +1621,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "00");
         test.done();
     },
-    
+
     testDateFmtYear0YYYY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "yyyy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 0,
             month: 12,
@@ -1640,12 +1639,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "0000");
         test.done();
     },
-    
+
     testDateFmtYear1YY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "yy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 1,
             month: 12,
@@ -1658,12 +1657,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "01");
         test.done();
     },
-    
+
     testDateFmtYear1YYYY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "yyyy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 1,
             month: 12,
@@ -1676,12 +1675,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "0001");
         test.done();
     },
-    
+
     testDateFmtYearMinus1YY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "yy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: -1,
             month: 12,
@@ -1694,12 +1693,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "-01");
         test.done();
     },
-    
+
     testDateFmtYearMinus1YYYY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "yyyy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: -1,
             month: 12,
@@ -1712,12 +1711,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "-0001");
         test.done();
     },
-    
+
     testDateFmtOrdinalUS1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1731,12 +1730,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1st");
         test.done();
     },
-    
+
     testDateFmtOrdinalUS2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1750,12 +1749,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "2nd");
         test.done();
     },
-    
+
     testDateFmtOrdinalUS3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1769,12 +1768,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "3rd");
         test.done();
     },
-    
+
     testDateFmtOrdinalUS4: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1788,12 +1787,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "4th");
         test.done();
     },
-    
+
     testDateFmtOrdinalUS21: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1807,12 +1806,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "21st");
         test.done();
     },
-    
+
     testDateFmtOrdinalUSDefaultCase: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "en-US"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-US",
             year: 2011,
@@ -1826,12 +1825,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "27th");
         test.done();
     },
-    
+
     testDateFmtOrdinalDE1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1845,12 +1844,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "1.");
         test.done();
     },
-    
+
     testDateFmtOrdinalDE2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1864,12 +1863,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "2.");
         test.done();
     },
-    
+
     testDateFmtOrdinalDE3: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1883,12 +1882,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "3.");
         test.done();
     },
-    
+
     testDateFmtOrdinalDE4: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1902,12 +1901,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "4.");
         test.done();
     },
-    
+
     testDateFmtOrdinalDE21: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1921,12 +1920,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "21.");
         test.done();
     },
-    
+
     testDateFmtOrdinalDEDefaultCase: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "O", locale: "de-DE"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "de-DE",
             year: 2011,
@@ -1940,12 +1939,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "27.");
         test.done();
     },
-    
+
     testDateFmtEraCE: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "G", locale: "en"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en",
             year: 2011,
@@ -1959,12 +1958,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "CE");
         test.done();
     },
-    
+
     testDateFmtEraBCE: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "G", locale: "en"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en",
             year: -46,
@@ -1978,12 +1977,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "BCE");
         test.done();
     },
-    
+
     testDateFmtEraCEBoundary: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "G", locale: "en"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en",
             year: 1,
@@ -1997,12 +1996,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "CE");
         test.done();
     },
-    
+
     testDateFmtEraBCEBoundary: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "G", locale: "en"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en",
             year: 0,
@@ -2016,12 +2015,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "BCE");
         test.done();
     },
-    
+
     testDateFmtStandAloneMonthFull: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "LLLL", locale: "fi-FI"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "fi-FI",
             year: 0,
@@ -2035,12 +2034,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "joulukuu");
         test.done();
     },
-    
+
     testDateFmtStandAloneMonthLong: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "LLL", locale: "fi-FI"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "fi-FI",
             year: 0,
@@ -2054,12 +2053,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "joulu");
         test.done();
     },
-    
+
     testDateFmtStandAloneMonthMedium: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "LL", locale: "fi-FI"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "fi-FI",
             year: 0,
@@ -2073,12 +2072,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "jo");
         test.done();
     },
-    
+
     testDateFmtInFormatMonthFull: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "MMMM", locale: "fi-FI"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "fi-FI",
             year: 0,
@@ -2092,12 +2091,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "joulukuuta");
         test.done();
     },
-    
+
     testDateFmtInFormatMonthMedium: function(test) {
         test.expect(2);
         var fmt = new DateFmt({template: "MM", locale: "fi-FI"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "fi-FI",
             year: 0,
@@ -2111,22 +2110,22 @@ module.exports.testdatefmt = {
         test.equal(fmt.format(date), "12");
         test.done();
     },
-    
+
     /*
     exception does not happen any more because we always convert
     the argument to the format method to an DateFactory first now.
     By default if a bogus argument is passed, this is treated as
     an empty/undefined parameter, which means the current date/time
-    
+
     testDateFmtNonDateObject: function(test) {
         var fmt = new DateFmt({
-            locale: "en-US", 
-            type: "time", 
+            locale: "en-US",
+            type: "time",
             length: "short",
             time: "hm"
         });
         test.ok(fmt !== null);
-       
+
         try {
             fmt.format({
                 locale: "en-US",
@@ -2142,12 +2141,12 @@ module.exports.testdatefmt = {
         test.done();
     },
     */
-    
+
     testDateFmtFormatRelativeWithinMinuteAfter: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2173,7 +2172,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2199,7 +2198,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2225,7 +2224,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2251,7 +2250,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2277,7 +2276,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2299,12 +2298,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.formatRelative(reference, date), "4 hours ago");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinFortnightAfter: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2330,7 +2329,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 11,
@@ -2352,12 +2351,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.formatRelative(reference, date), "4 days ago");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinQuarterAfter: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2383,7 +2382,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2405,12 +2404,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.formatRelative(reference, date), "9 weeks ago");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinTwoYearsAfter: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2436,7 +2435,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2458,12 +2457,12 @@ module.exports.testdatefmt = {
         test.equal(fmt.formatRelative(reference, date), "14 months ago");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeYearsAfter: function(test) {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2489,7 +2488,7 @@ module.exports.testdatefmt = {
         test.expect(2);
         var fmt = new DateFmt({length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2511,7 +2510,7 @@ module.exports.testdatefmt = {
         test.equal(fmt.formatRelative(reference, date), "21 years ago");
         test.done();
     },
-    
+
     testDateFmtConvertToGMT: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2522,7 +2521,7 @@ module.exports.testdatefmt = {
             time: "hmaz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2534,11 +2533,11 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles",
             locale: "en-US"
         });
-        
+
         test.equal(fmt.format(date), "20/09/2011, 21:45 GMT/BST");
         test.done();
     },
-    
+
     testDateFmtConvertToOtherTimeZone: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2549,7 +2548,7 @@ module.exports.testdatefmt = {
             time: "hmaz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             year: 2011,
             month: 9,
@@ -2561,11 +2560,11 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles",
             locale: "en-US"
         });
-        
+
         test.equal(fmt.format(date), "21/9/11, 6:45 am AEST");
         test.done();
     },
-    
+
     testDateFmtForTZWithNonWholeOffset1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2575,16 +2574,16 @@ module.exports.testdatefmt = {
             timezone: "America/St_Johns"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             unixtime: 1394834293627,
             timezone: "Etc/UTC"
         });
-        
+
         test.equal(fmt.format(date), "7:28 p.m.");
         test.done();
     },
-    
+
     testDateFmtForTZWithNonWholeOffset2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2594,7 +2593,7 @@ module.exports.testdatefmt = {
             timezone: "America/St_Johns"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "Etc/UTC",
             year: 2014,
@@ -2605,12 +2604,12 @@ module.exports.testdatefmt = {
             second: 13,
             millisecond: 627
         });
-        
+
         // St. John's is -3:30 from UTC, plus 1 hour DST
         test.equal(fmt.format(date), "7:28 p.m.");
         test.done();
     },
-    
+
     testDateFmtForTZWithNonWholeOffsetQuarterHour: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2620,17 +2619,17 @@ module.exports.testdatefmt = {
             timezone: "Asia/Kathmandu"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             unixtime: 1394834293627,
             timezone: "Etc/UTC"
         });
-    
+
         // Kathmandu is 5:45 ahead of UTC, no DST
         test.equal(fmt.format(date), "3:43 a.m.");
         test.done();
     },
-    
+
     testDateFmtForTZWithNonWholeOffsetQuarterHour2: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2640,7 +2639,7 @@ module.exports.testdatefmt = {
             timezone: "Asia/Kathmandu"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "Etc/UTC",
             year: 2014,
@@ -2651,12 +2650,12 @@ module.exports.testdatefmt = {
             second: 13,
             millisecond: 627
         });
-        
+
         // Kathmandu is 5:45 ahead of UTC, no DST
         test.equal(fmt.format(date), "3:43 a.m.");
         test.done();
     },
-    
+
     // test locales that are tier 2 and below by doing a single test to see that it basically works
     testDateFmtenNG: function(test) {
         test.expect(2);
@@ -2668,7 +2667,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-NG",
             year: 2011,
@@ -2679,11 +2678,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "Tuesday, 20 September 2011 at 1:45 pm");
         test.done();
     },
-    
+
     testDateFmtenPH: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2694,7 +2693,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-PH",
             year: 2011,
@@ -2705,11 +2704,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "Tuesday, 20 September 2011 at 1:45 pm");
         test.done();
     },
-    
+
     testDateFmtenPK: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2720,7 +2719,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-PK",
             year: 2011,
@@ -2731,11 +2730,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "Tuesday, 20 September 2011 at 1:45 pm");
         test.done();
     },
-    
+
     testDateFmtenAU: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2746,7 +2745,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-AU",
             year: 2011,
@@ -2757,11 +2756,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "Tuesday, 20 September 2011 at 1:45 pm");
         test.done();
     },
-    
+
     testDateFmtenZA: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2772,7 +2771,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "en-ZA",
             year: 2011,
@@ -2783,11 +2782,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "Tuesday, 20 September 2011 at 13:45");
         test.done();
     },
-    
+
     testDateFmtesES: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2798,7 +2797,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "es-ES",
             year: 2011,
@@ -2809,11 +2808,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "martes, 20 de septiembre de 2011, 13:45");
         test.done();
     },
-    
+
     testDateFmtesMX: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2824,7 +2823,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "es-MX",
             year: 2011,
@@ -2835,11 +2834,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
-        test.equal(fmt.format(date), "martes, 20 de septiembre de 2011, 13:45");
+
+        test.equal(fmt.format(date), "martes, 20 de septiembre de 2011 a las 13:45");
         test.done();
     },
-    
+
     testDateFmtesAR: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2850,7 +2849,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "es-AR",
             year: 2011,
@@ -2861,12 +2860,12 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
-        test.equal(fmt.format(date), "martes, 20 de septiembre de 2011, 13:45");
+
+        test.equal(fmt.format(date), "martes, 20 de septiembre de 2011 a las 13:45");
         test.done();
-                      
+
     },
-    
+
     testDateFmttrTR: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2877,7 +2876,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "tr-TR",
             year: 2011,
@@ -2888,11 +2887,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "20 Eylül 2011 Salı 13:45");
         test.done();
     },
-    
+
     testDateFmttrSV: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2903,7 +2902,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "sv-SE",
             year: 2011,
@@ -2914,11 +2913,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "torsdag 20 oktober 2011 13:45");
         test.done();
     },
-    
+
     testDateFmttrNO: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2929,7 +2928,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "no-NO",
             year: 2011,
@@ -2940,11 +2939,11 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "Torsdag 20. oktober 2011 13.45");
         test.done();
     },
-    
+
     testDateFmttrDA: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -2955,7 +2954,7 @@ module.exports.testdatefmt = {
             time: "hma"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "da-DK",
             year: 2011,
@@ -2966,7 +2965,7 @@ module.exports.testdatefmt = {
             second: 0,
             millisecond: 0
         });
-        
+
         test.equal(fmt.format(date), "torsdag den 20. oktober 2011 kl. 13.45");
         test.done();
     },
@@ -3097,16 +3096,16 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             timezone: "Etc/UTC",
             unixtime: 1394359140000 // this is 3/9/2014 at 1:59am
         });
-        
+
         test.equal(fmt.format(date), "1:59 AM PST");
         test.done();
     },
-    
+
     testDateFmtTransitionToDSTRightAfter: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3116,17 +3115,17 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             timezone: "Etc/UTC",
             unixtime: 1394359260000
         });
-        
+
         // 2 minutes later
         test.equal(fmt.format(date), "3:01 AM PDT");
         test.done();
     },
-    
+
     testDateFmtTransitionFromDSTDayBefore: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3136,16 +3135,16 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             timezone: "Etc/UTC",
             unixtime: 1414828740000 // this is 11/1/2014 at 0:59am
         });
-        
+
         test.equal(fmt.format(date), "12:59 AM PDT");
         test.done();
     },
-    
+
     testDateFmtTransitionFromDSTWellBefore: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3155,16 +3154,16 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             timezone: "Etc/UTC",
             unixtime: 1414915140000 // this is 11/2/2014 at 0:59am
         });
-        
+
         test.equal(fmt.format(date), "12:59 AM PDT");
         test.done();
     },
-    
+
     testDateFmtTransitionFromDSTRightBefore: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3174,16 +3173,16 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             timezone: "Etc/UTC",
             unixtime: 1414918740000 // this is 11/2/2014 at 1:59am
         });
-        
+
         test.equal(fmt.format(date), "1:59 AM PDT");
         test.done();
     },
-    
+
     testDateFmtTransitionFromDSTRightAfter: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3193,18 +3192,18 @@ module.exports.testdatefmt = {
             timezone: "America/Los_Angeles"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             timezone: "Etc/UTC",
             unixtime: 1414918860000
         });
-        
+
         // 2 minutes later
         test.equal(fmt.format(date), "1:01 AM PST");
         test.done();
     },
-    
-    
+
+
     testDateFmtAltCalThaiInEnglish: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3215,16 +3214,16 @@ module.exports.testdatefmt = {
             calendar: "thaisolar"
         });
         test.ok(fmt !== null);
-        
+
         var date = new ThaiSolarDate({
             timezone: "America/Los_Angeles",
             unixtime: 1404445524043
         });
-        
+
         test.equal(fmt.format(date), "Karakadakhom 3, 2557 at 8:45 PM");
         test.done();
     },
-    
+
     testDateFmtAltCalHebrewInEnglish: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3235,16 +3234,16 @@ module.exports.testdatefmt = {
             calendar: "hebrew"
         });
         test.ok(fmt !== null);
-        
+
         var date = new HebrewDate({
             timezone: "America/Los_Angeles",
             unixtime: 1404445524043
         });
-        
+
         test.equal(fmt.format(date), "Tammuz 6, 5774 at 8:45 PM");
         test.done();
     },
-    
+
     testDateFmtAltCalIslamicInEnglish: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3255,16 +3254,16 @@ module.exports.testdatefmt = {
             calendar: "islamic"
         });
         test.ok(fmt !== null);
-        
+
         var date = new IslamicDate({
             timezone: "America/Los_Angeles",
             unixtime: 1404445524043
         });
-        
+
         test.equal(fmt.format(date), "Ramaḍān 5, 1435 at 8:45 PM");
         test.done();
     },
-    
+
     testDateFmtAltCalPersianInEnglish: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
@@ -3275,283 +3274,283 @@ module.exports.testdatefmt = {
             calendar: "persian"
         });
         test.ok(fmt !== null);
-        
+
         var date = new PersianDate({
             timezone: "America/Los_Angeles",
             unixtime: 1404445524043
         });
-        
+
         test.equal(fmt.format(date), "Tir 12, 1393 at 8:45 PM");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeLength_with_am_ET_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.length, 5);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_am_ET_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "ጥዋት");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeStart_with_am_ET_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].start, "00:00");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeEnd_with_am_ET_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].end, "05:59");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeLength_with_am_ET_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.length, 2);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_am_ET_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "ጥዋት");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeStart_with_am_ET_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].start, "00:00");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeEnd_with_am_ET_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].end, "11:59");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeLength_with_am_ET_locale_ethiopic_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "ethiopic"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.length, 5);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_am_ET_locale_ethiopic_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "ethiopic"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "ጥዋት");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeStart_with_am_ET_locale_ethiopic_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "ethiopic"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].start, "00:00");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeEnd_with_am_ET_locale_ethiopic_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "am-ET", meridiems: "ethiopic"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].end, "05:59");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeLength_with_zh_CN_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.length, 2);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_zh_CN_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "上午");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeStart_with_zh_CN_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].start, "00:00");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeEnd_with_zh_CN_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].end, "11:59");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeLength_with_zh_CN_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.length, 2);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_zh_CN_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "上午");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeStart_with_zh_CN_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].start, "00:00");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeEnd_with_zh_CN_locale_gregorian_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "gregorian"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].end, "11:59");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeLength_with_zh_CN_locale_chinese_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "chinese"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.length, 7);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_zh_CN_locale_chinese_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "chinese"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "凌晨");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeStart_with_zh_CN_locale_chinese_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "chinese"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].start, "00:00");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeEnd_with_zh_CN_locale_chinese_meridiems: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "zh-CN", meridiems: "chinese"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].end, "05:59");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeLength_with_en_US_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "en-US"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.length, 2);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_en_US_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "en-US"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeStart_with_en_US_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({ locale: "en-US"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].start, "00:00");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeEnd_with_en_US_locale: function(test) {
         test.expect(2);
         var fmt = DateFmt.getMeridiemsRange({locale: "en-US"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].end, "11:59");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_bn_IN_locale: function(test) {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "bn-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_gu_IN_locale: function(test) {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "gu-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
         test.done();
@@ -3560,7 +3559,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "kn-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "ಪೂರ್ವಾಹ್ನ");
         test.equal(fmt[1].name, "ಅಪರಾಹ್ನ");
         test.done();
@@ -3569,7 +3568,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "ml-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
         test.done();
@@ -3578,7 +3577,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "mr-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "म.पू.");
         test.equal(fmt[1].name, "म.उ.");
         test.done();
@@ -3587,7 +3586,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "or-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
         test.done();
@@ -3596,7 +3595,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "pa-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "ਪੂ.ਦੁ.");
         test.equal(fmt[1].name, "ਬਾ.ਦੁ.");
         test.done();
@@ -3605,7 +3604,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "ta-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "முற்பகல்");
         test.equal(fmt[1].name, "பிற்பகல்");
         test.done();
@@ -3614,7 +3613,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "te-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
         test.done();
@@ -3623,7 +3622,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "ur-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
         test.done();
@@ -3632,7 +3631,7 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "as-IN"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, 'পূৰ্বাহ্ন');
         test.equal(fmt[1].name,  'অপৰাহ্ন');
         test.done();
@@ -3641,120 +3640,120 @@ module.exports.testdatefmt = {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "hi-IN"});
         test.ok(fmt !== null);
-    
-        test.equal(fmt[0].name, "पूर्वाह्न");
-        test.equal(fmt[1].name, "अपराह्न");
+
+        test.equal(fmt[0].name, "am");
+        test.equal(fmt[1].name, "pm");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRangeName_with_ur_PK_locale: function(test) {
         test.expect(3);
         var fmt = DateFmt.getMeridiemsRange({locale: "ur-PK"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt[0].name, "AM");
         test.equal(fmt[1].name, "PM");
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRange_with_noArgument: function(test) {
         test.expect(2);
         var fmt = new DateFmt();
         test.ok(fmt !== null);
-    
+
         var mdRange = fmt.getMeridiemsRange();
         // if locale is not specified, DateFmt takes default locale.
         test.ok("getMeridiemsRange should return length value greater than 0", mdRange.length > 0);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRange_with_undefined_locale: function(test) {
         test.expect(2);
         var fmt = new DateFmt({ locale: undefined });
         test.ok(fmt !== null);
-    
+
         var mdRange = fmt.getMeridiemsRange();
         // if locale is not specified, DateFmt takes default locale.
         test.ok("getMeridiemsRange should return length value greater than 0", mdRange.length > 0);
         test.done();
     },
-    
+
     testDateFmtGetMeridiemsRange_with_wrong_locale: function(test) {
         test.expect(2);
         var fmt = new DateFmt({ locale: "wrong" });
         test.ok(fmt !== null);
-    
+
         var mdRange = fmt.getMeridiemsRange();
         // if locale is specified wrong value, DateFmt takes default locale.
         test.ok("getMeridiemsRange should return length value greater than 0", mdRange.length > 0);
         test.done();
     },
-    
+
     testDateFmtTimeTemplate_mms: function(test) {
         test.expect(2);
         var fmt = new DateFmt({clock: "24", template: "mm:s"});
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.format({minute: 0, second: 9}).toString(), "00:9");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentOrderEN: function(test) {
     	test.expect(2);
-    	
+
     	var fmt = new DateFmt({locale: "en"})
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.getDateComponentOrder(), "mdy");
         test.done();
     },
-    
+
     testDateFmtGetDateComponentOrderENGB: function(test) {
     	test.expect(2);
-    	
+
     	var fmt = new DateFmt({locale: "en-GB"})
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.getDateComponentOrder(), "dmy");
         test.done();
     },
-   
+
     testDateFmtGetDateComponentOrderENUS: function(test) {
     	test.expect(2);
-    	
+
     	var fmt = new DateFmt({locale: "en-US"})
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.getDateComponentOrder(), "mdy");
         test.done();
     },
 
     testDateFmtGetDateComponentOrderDE: function(test) {
     	test.expect(2);
-    	
+
     	var fmt = new DateFmt({locale: "de-DE"})
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.getDateComponentOrder(), "dmy");
         test.done();
     },
 
     testDateFmtGetDateComponentOrderAK: function(test) {
     	test.expect(2);
-    	
+
     	var fmt = new DateFmt({locale: "ak-GH"})
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.getDateComponentOrder(), "ymd");
         test.done();
     },
 
     testDateFmtGetDateComponentOrderLV: function(test) {
     	test.expect(2);
-    	
+
     	var fmt = new DateFmt({locale: "lv-LV"})
         test.ok(fmt !== null);
-    
+
         test.equal(fmt.getDateComponentOrder(), "ydm");
         test.done();
     }
diff --git a/js/test/date/testdatefmt_bg.js b/js/test/date/testdatefmt_bg.js
index 1c6c9fb22c..12cf44574f 100644
--- a/js/test/date/testdatefmt_bg.js
+++ b/js/test/date/testdatefmt_bg.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmt_bg_BG.js - test the date formatter object in bulgarian
- * 
+ *
  * Copyright © 2012-2015,2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,17 +39,17 @@ module.exports.testdatefmt_bg = {
     testDateFmtConstructorEmpty_bg_BG: function(test) {
         test.expect(1);
         var fmt = new DateFmt({locale: "bg-BG"});
-        
+
         test.ok(fmt !== null);
         test.done();
     },
-    
-    
+
+
     testDateFmtSimpleShort_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -63,12 +63,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29.09.11 г.");
         test.done();
     },
-    
+
     testDateFmtSimpleMedium_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -82,12 +82,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29.09.2011 г.");
         test.done();
     },
-    
+
     testDateFmtSimpleLong_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -101,12 +101,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29 септември 2011 г.");
         test.done();
     },
-    
+
     testDateFmtSimpleFull_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -120,12 +120,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29 септември 2011 г.");
         test.done();
     },
-    
+
     testDateFmtSimpleTimeShort_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "short", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -136,15 +136,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtSimpleTimeMedium_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "medium", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -155,15 +155,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtSimpleTimeLong_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", timelength: "long", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -174,15 +174,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtSimpleTimeFull_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -193,15 +193,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleShort_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "short", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -212,15 +212,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29.09.11 г., 13:45 ч.");
+        test.equal(fmt.format(date), '29.09.11 г., 13:45');
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleMedium_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "medium", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -231,15 +231,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29.09.2011 г., 13:45 ч.");
+        test.equal(fmt.format(date), '29.09.2011 г., 13:45');
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleLong_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "long", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -250,15 +250,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 септември 2011 г., 13:45 ч.");
+        test.equal(fmt.format(date), '29 септември 2011 г., 13:45');
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleFull_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -269,16 +269,16 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 септември 2011 г., 13:45 ч.");
+        test.equal(fmt.format(date), '29 септември 2011 г., 13:45');
         test.done();
     },
-    
-    
+
+
     testDateFmtTemplateCalendar_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", calendar: "julian", template: "yyyy-MM-dd"});
         test.ok(fmt !== null);
-        
+
         var date = new JulianDate({
             locale: "bg-BG",
             year: 2011,
@@ -292,13 +292,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "2011-09-29");
         test.done();
     },
-    
-    
+
+
     testDateFmtTemplateClock12SwitchHH_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", clock: "12", template: "HH:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -312,12 +312,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateClock12Switchkk_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", clock: "12", template: "kk:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -331,12 +331,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateClock24Switchhh_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", clock: "24", template: "hh:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -350,12 +350,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtTemplateClock24SwitchKK_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", clock: "24", template: "KK:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -369,12 +369,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockDoNotFollowLocaleDefault12hh_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", template: "hh:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -388,12 +388,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockDoNotFollowLocaleDefault12KK_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", template: "KK:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -407,12 +407,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockDoNotFollowLocaleDefault24HH_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", template: "HH:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -426,12 +426,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockDoNotFollowLocaleDefault24kk_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", template: "kk:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -445,13 +445,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
-    
+
+
     testDateFmtTypeDate_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "date"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -465,12 +465,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29.09.11 г.");
         test.done();
     },
-    
+
     testDateFmtTypeTime_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -481,15 +481,15 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtTypeDateTime_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -500,16 +500,16 @@ module.exports.testdatefmt_bg = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29.09.11 г., 13:45 ч.");
+        test.equal(fmt.format(date), '29.09.11 г., 13:45');
         test.done();
     },
-    
-    
+
+
     testDateFmtShortDateComponentsY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "y"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -523,12 +523,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "11");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -542,12 +542,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "09");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsN_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "n"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -561,12 +561,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "с");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsD_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "d"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -580,12 +580,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsDM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "dm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -599,13 +599,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29.09");
         test.done();
     },
-    
+
     /*
     testDateFmtShortDateComponentsMY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "my"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -620,12 +620,12 @@ module.exports.testdatefmt_bg = {
         test.done();
     },
     */
-    
+
     testDateFmtShortDateComponentsDMY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "dmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -639,12 +639,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29.09.11 г.");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsWDM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "wdm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -658,13 +658,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "ч, 29.09");
         test.done();
     },
-    
+
     /*
     testDateFmtShortDateComponentsWDMY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -679,12 +679,12 @@ module.exports.testdatefmt_bg = {
         test.done();
     },
     */
-    
+
     testDateFmtFullDateComponentsY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "y"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -698,12 +698,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "2011");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -717,12 +717,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "септември");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsD_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "d"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -736,12 +736,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsDM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "dm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -755,12 +755,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29 септември");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsMY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "my"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -774,12 +774,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "септември 2011 г.");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsDMY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "dmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -793,12 +793,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "29 септември 2011 г.");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsWDM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "wdm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -812,13 +812,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "четвъртък, 29 септември");
         test.done();
     },
-    
+
     /*
     testDateFmtFullDateComponentsWDMY_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -832,14 +832,14 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "четвъртък, 29 септ. 2011 г.");
         test.done();
     },
-    
+
     */
-    
+
     testDateFmtShortTimeComponentsS_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "s"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -853,12 +853,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -872,12 +872,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsH_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "h"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -891,12 +891,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "13");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsMS_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "ms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -910,12 +910,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "45:37");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "hm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -926,15 +926,15 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMS_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "hms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -945,15 +945,15 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч.");
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMA_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "hma"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -964,20 +964,20 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            time: "hmz", 
+            locale: "bg-BG",
+            type: "time",
+            time: "hmz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -988,20 +988,20 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч. EEST");
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMAZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            time: "hmaz", 
+            locale: "bg-BG",
+            type: "time",
+            time: "hmaz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1012,15 +1012,15 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч. EEST");
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMSA_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", time: "hmsa"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1031,20 +1031,20 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч.");
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMSZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            time: "hmsz", 
+            locale: "bg-BG",
+            type: "time",
+            time: "hmsz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1055,20 +1055,20 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч. EEST");
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMSAZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            time: "hmsaz", 
+            locale: "bg-BG",
+            type: "time",
+            time: "hmsaz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1079,16 +1079,16 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч. EEST");
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
-    
-    
+
+
     testDateFmtFullTimeComponentsS_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "s"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1102,12 +1102,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1121,12 +1121,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsH_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "h"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1140,12 +1140,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "13");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsMS_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "ms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1159,12 +1159,12 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.format(date), "45:37");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHM_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "hm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1175,15 +1175,15 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMS_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "hms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1194,15 +1194,15 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч.");
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMA_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "hma"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1213,21 +1213,21 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч.");
+        test.equal(fmt.format(date), '13:45');
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            length: "full", 
-            time: "hmz", 
+            locale: "bg-BG",
+            type: "time",
+            length: "full",
+            time: "hmz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1238,21 +1238,21 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч. EEST");
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMAZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            length: "full", 
-            time: "hmaz", 
+            locale: "bg-BG",
+            type: "time",
+            length: "full",
+            time: "hmaz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1263,15 +1263,15 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 ч. EEST");
+        test.equal(fmt.format(date), '13:45 EEST');
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMSA_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", type: "time", length: "full", time: "hmsa"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1282,21 +1282,21 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч.");
+        test.equal(fmt.format(date), '13:45:37');
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMSZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            length: "full", 
-            time: "hmsz", 
+            locale: "bg-BG",
+            type: "time",
+            length: "full",
+            time: "hmsz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1307,21 +1307,21 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч. EEST");
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMSAZ_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            length: "full", 
-            time: "hmsaz", 
+            locale: "bg-BG",
+            type: "time",
+            length: "full",
+            time: "hmsaz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1332,21 +1332,21 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч. EEST");
+        test.equal(fmt.format(date), '13:45:37 EEST');
         test.done();
     },
-    
+
     testDateFmtWithTimeZoneAndNoDST_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "bg-BG", 
-            type: "time", 
-            length: "full", 
-            time: "hmsz", 
+            locale: "bg-BG",
+            type: "time",
+            length: "full",
+            time: "hmsz",
             timezone: "Europe/Sofia"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1357,16 +1357,16 @@ module.exports.testdatefmt_bg = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 ч. EET");
+        test.equal(fmt.format(date), '13:45:37 EET');
         test.done();
     },
-    
+
     /*
     testDateFmtFormatRelativeWithinMinuteAfter_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1391,12 +1391,12 @@ module.exports.testdatefmt_bg = {
         test.done();
     },
     */
-    
+
     testDateFmtFormatRelativeWithinMinuteBefore_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1425,7 +1425,7 @@ module.exports.testdatefmt_bg = {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1450,12 +1450,12 @@ module.exports.testdatefmt_bg = {
         test.done();
     },
     */
-    
+
     testDateFmtFormatRelativeWithinHourBefore_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1484,7 +1484,7 @@ module.exports.testdatefmt_bg = {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1513,7 +1513,7 @@ module.exports.testdatefmt_bg = {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1537,13 +1537,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.formatRelative(reference, date), "преди 4 часа");
         test.done();
     },
-    
+
     /*
     testDateFmtFormatRelativeWithinFortnightAfter_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1572,7 +1572,7 @@ module.exports.testdatefmt_bg = {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1596,13 +1596,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.formatRelative(reference, date), "преди 4 дни");
         test.done();
     },
-    
+
     /*
     testDateFmtFormatRelativeWithinQuarterAfter_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1631,7 +1631,7 @@ module.exports.testdatefmt_bg = {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1655,13 +1655,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.formatRelative(reference, date), "преди 9 седмици");
         test.done();
     },
-    
+
     /*
     testDateFmtFormatRelativeWithinTwoYearsAfter_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1690,7 +1690,7 @@ module.exports.testdatefmt_bg = {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1714,13 +1714,13 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.formatRelative(reference, date), "преди 14 месеца");
         test.done();
     },
-    
+
     /*
     testDateFmtFormatRelativeYearsAfter_bg_BG: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1749,7 +1749,7 @@ module.exports.testdatefmt_bg = {
         test.expect(2);
         var fmt = new DateFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "bg-BG",
             year: 2011,
@@ -1773,6 +1773,6 @@ module.exports.testdatefmt_bg = {
         test.equal(fmt.formatRelative(reference, date), "преди 21 години");
         test.done();
     }
-    
-    
+
+
 };
diff --git a/js/test/date/testdatefmt_bs_Cyrl_BA.js b/js/test/date/testdatefmt_bs_Cyrl_BA.js
index fdb4d619b2..a870b96f8c 100644
--- a/js/test/date/testdatefmt_bs_Cyrl_BA.js
+++ b/js/test/date/testdatefmt_bs_Cyrl_BA.js
@@ -1401,7 +1401,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 30,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "пре 30 секунди");
+        test.equal(fmt.formatRelative(reference, date), 'прије 30 секунди');
         test.done();
     },
     testDateFmtFormatRelativeWithinHourAfter_bs_Cyrl_BA: function(test) {
@@ -1457,7 +1457,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "пре 10 минута");
+        test.equal(fmt.formatRelative(reference, date), 'прије 10 минута');
         test.done();
     },
     testDateFmtFormatRelativeWithinDayAfter_bs_Cyrl_BA: function(test) {
@@ -1513,7 +1513,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "пре 4 сата");
+        test.equal(fmt.formatRelative(reference, date), 'прије 4 сата');
         test.done();
     },
 
@@ -1570,7 +1570,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "пре 4 дана");
+        test.equal(fmt.formatRelative(reference, date), 'прије 4 дана');
         test.done();
     },
 
@@ -1599,7 +1599,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "за 9 недеља");
+        test.equal(fmt.formatRelative(reference, date), 'за 9 седмица');
         test.done();
     },
     testDateFmtFormatRelativeWithinQuarterBefore_bs_Cyrl_BA: function(test) {
@@ -1627,7 +1627,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "пре 9 недеља");
+        test.equal(fmt.formatRelative(reference, date), 'прије 9 седмица');
         test.done();
     },
 
@@ -1656,7 +1656,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "за 16 месеци");
+        test.equal(fmt.formatRelative(reference, date), 'за 16 мјесеци');
         test.done();
     },
     testDateFmtFormatRelativeWithinTwoYearsBefore_bs_Cyrl_BA: function(test) {
@@ -1684,7 +1684,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "пре 14 месеци");
+        test.equal(fmt.formatRelative(reference, date), 'прије 14 мјесеци');
         test.done();
     },
 
@@ -1741,7 +1741,7 @@ module.exports.testdatefmt_bs_Cyrl_BA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "пре 21 годину");
+        test.equal(fmt.formatRelative(reference, date), 'прије 21 годину');
         test.done();
     }
 };
diff --git a/js/test/date/testdatefmt_fr_CA.js b/js/test/date/testdatefmt_fr_CA.js
index 4577d9cf5d..64d0fea400 100644
--- a/js/test/date/testdatefmt_fr_CA.js
+++ b/js/test/date/testdatefmt_fr_CA.js
@@ -59,7 +59,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "11-09-29");
+        test.equal(fmt.format(date), '2011-09-29');
         test.done();
     },
 
@@ -211,7 +211,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "11-09-29 13 h 45");
+        test.equal(fmt.format(date), '2011-09-29 13 h 45');
         test.done();
     },
 
@@ -479,7 +479,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "11-09-29");
+        test.equal(fmt.format(date), '2011-09-29');
         test.done();
     },
 
@@ -517,7 +517,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "11-09-29 13 h 45");
+        test.equal(fmt.format(date), '2011-09-29 13 h 45');
         test.done();
     },
 
@@ -537,7 +537,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "11");
+        test.equal(fmt.format(date), '2011');
         test.done();
     },
 
@@ -632,7 +632,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "11-09");
+        test.equal(fmt.format(date), '2011-09');
         test.done();
     },
 
@@ -651,7 +651,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "11-09-29");
+        test.equal(fmt.format(date), '2011-09-29');
         test.done();
     },
 
@@ -689,7 +689,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "J 11-09-29");
+        test.equal(fmt.format(date), 'J 2011-09-29');
         test.done();
     },
 
@@ -919,7 +919,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "45 min 37 s");
+        test.equal(fmt.format(date), '45 min 37');
         test.done();
     },
 
@@ -1172,7 +1172,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "45 min 37 s");
+        test.equal(fmt.format(date), '45 min 37');
         test.done();
     },
 
@@ -1748,7 +1748,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "Dans 14 ans");
+        test.equal(fmt.formatRelative(reference, date), 'dans 14 ans');
         test.done();
     },
     testDateFmtFormatRelativeYearsBefore_fr_CA: function(test) {
@@ -1776,7 +1776,7 @@ module.exports.testdatefmt_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "Il y a 21 ans");
+        test.equal(fmt.formatRelative(reference, date), 'il y a 21 ans');
         test.done();
     }
 };
diff --git a/js/test/date/testdatefmt_ha_Latn_NG.js b/js/test/date/testdatefmt_ha_Latn_NG.js
index 7b2e55b626..5ee63afe99 100644
--- a/js/test/date/testdatefmt_ha_Latn_NG.js
+++ b/js/test/date/testdatefmt_ha_Latn_NG.js
@@ -895,7 +895,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "L, 29/9");
+        test.equal(fmt.format(date), 'L 29/9');
         test.done();
     },
 
@@ -914,7 +914,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "L, 29/9/54");
+        test.equal(fmt.format(date), 'L 29/9/54');
         test.done();
     },
 
@@ -1048,7 +1048,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Alhamis, 19 Faburairu");
+        test.equal(fmt.format(date), 'Alhamis 19 Faburairu');
         test.done();
     },
 
@@ -1067,7 +1067,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "Alhamis, 19 Faburairu, 2015");
+        test.equal(fmt.format(date), 'Alhamis 19 Faburairu, 2015');
         test.done();
     },
 
@@ -1201,7 +1201,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 PM");
+        test.equal(fmt.format(date), '1:45 Yamma');
         test.done();
     },
 
@@ -1266,7 +1266,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 PM");
+        test.equal(fmt.format(date), '1:45:37 Yamma');
         test.done();
     },
 
@@ -1446,7 +1446,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 PM");
+        test.equal(fmt.format(date), '1:45 Yamma');
         test.done();
     },
 
@@ -1513,7 +1513,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 PM");
+        test.equal(fmt.format(date), '1:45:37 Yamma');
         test.done();
     },
 
@@ -1614,7 +1614,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 30,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "+30 s");
+        test.equal(fmt.formatRelative(reference, date), 'cikin 30 dakika');
         test.done();
     },
     testDateFmtFormatRelativeWithinMinuteBefore_ha_Latn: function(test) {
@@ -1642,7 +1642,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 30,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "-30 s");
+        test.equal(fmt.formatRelative(reference, date), '30 dakika da ya gabata');
         test.done();
     },
     testDateFmtFormatRelativeWithinHourAfter_ha_Latn: function(test) {
@@ -1670,7 +1670,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "+10 min");
+        test.equal(fmt.formatRelative(reference, date), 'cikin 10 minti');
         test.done();
     },
     testDateFmtFormatRelativeWithinHourBefore_ha_Latn: function(test) {
@@ -1698,7 +1698,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "-10 min");
+        test.equal(fmt.formatRelative(reference, date), '10 minti da ya gabata');
         test.done();
     },
     testDateFmtFormatRelativeWithinDayAfter_ha_Latn: function(test) {
@@ -1726,7 +1726,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "+4 h");
+        test.equal(fmt.formatRelative(reference, date), 'cikin 4 awa');
         test.done();
     },
     testDateFmtFormatRelativeWithinDayBefore_ha_Latn: function(test) {
@@ -1754,7 +1754,7 @@ module.exports.testdatefmt_ha_Latn_NG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.formatRelative(reference, date), "-4 h");
+        test.equal(fmt.formatRelative(reference, date), '4 awa da ya gabata');
         test.done();
     },
 
diff --git a/js/test/date/testdatefmt_hi_IN.js b/js/test/date/testdatefmt_hi_IN.js
index 98f1f08c93..5d341a4362 100644
--- a/js/test/date/testdatefmt_hi_IN.js
+++ b/js/test/date/testdatefmt_hi_IN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmt_hi_IN.js - test the date formatter object in Hindi for India
- * 
+ *
  * Copyright © 2013-2015,2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,17 +39,17 @@ module.exports.testdatefmt_hi_IN = {
     testDateFmtINConstructorEmpty_hi_IN: function(test) {
         test.expect(1);
         var fmt = new DateFmt({locale: "hi-IN"});
-        
+
         test.ok(typeof(fmt) !== "undefined");
         test.done();
     },
-    
-    
+
+
     testDateFmtINSimpleShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "short"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -62,12 +62,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29/9/11");
         test.done();
     },
-    
+
     testDateFmtINSimpleMedium_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "medium"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -81,12 +81,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29 सित॰ 2011");
         test.done();
     },
-    
+
     testDateFmtINSimpleLong_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "long"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -100,12 +100,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29 सितंबर 2011");
         test.done();
     },
-    
+
     testDateFmtINSimpleFull_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -119,12 +119,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29 सितंबर 2011");
         test.done();
     },
-    
+
     testDateFmtINSimpleTimeShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "short", type: "time"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -135,15 +135,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), '1:45 pm');
         test.done();
     },
-    
+
     testDateFmtINSimpleTimeShort_hi_IN1: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "short", type: "time"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -154,15 +154,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), '1:45 pm');
         test.done();
     },
-    
+
     testDateFmtINSimpleTimeMedium_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "medium", type: "time"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -173,15 +173,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), '1:45 pm');
         test.done();
     },
-    
+
     testDateFmtINSimpleTimeLong_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", timelength: "long", type: "time"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -192,15 +192,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), '1:45 pm');
         test.done();
     },
-    
+
     testDateFmtINSimpleTimeFull_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", type: "time"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -211,15 +211,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), '1:45 pm');
         test.done();
     },
-    
+
     testDateFmtINDateTimeSimpleShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "short", type: "datetime"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -230,15 +230,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/9/11, 1:45 अपराह्न");
+        test.equal(fmt.format(date), "29/9/11, 1:45 pm");
         test.done();
     },
-    
+
     testDateFmtINDateTimeSimpleMedium_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "medium", type: "datetime"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -249,15 +249,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 सित॰ 2011, 1:45 अपराह्न");
+        test.equal(fmt.format(date), "29 सित॰ 2011, 1:45 pm");
         test.done();
     },
-    
+
     testDateFmtINDateTimeSimpleLong_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "long", type: "datetime"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -268,15 +268,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 सितंबर 2011 को 1:45 अपराह्न");
+        test.equal(fmt.format(date), "29 सितंबर 2011 को 1:45 pm");
         test.done();
     },
-    
+
     testDateFmtINDateTimeSimpleFull_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", type: "datetime"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -287,16 +287,16 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 सितंबर 2011 को 1:45 अपराह्न");
+        test.equal(fmt.format(date), "29 सितंबर 2011 को 1:45 pm");
         test.done();
     },
-    
-    
+
+
     testDateFmtINTemplateCalendar_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", calendar: "julian", template: "yyyy-MM-dd", timezone: "local"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new JulianDate({
             year: 2011,
             month: 9,
@@ -309,14 +309,14 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "2011-09-29");
         test.done();
     },
-    
-    
-    
+
+
+
     testDateFmtINTemplateClock12SwitchHH_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", clock: "12", template: "HH:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -330,12 +330,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtINTemplateClock12Switchkk_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", clock: "12", template: "kk:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -349,12 +349,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtINTemplateClock24Switchhh_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", clock: "24", template: "hh:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -368,12 +368,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtINTemplateClock24SwitchKK_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", clock: "24", template: "KK:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -387,12 +387,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtINTemplateNoClockDoNotFollowLocaleDefault12hh_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", template: "hh:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -406,12 +406,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtINTemplateNoClockDoNotFollowLocaleDefault12KK_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", template: "KK:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -425,12 +425,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtINTemplateNoClockDoNotFollowLocaleDefault24HH_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", template: "HH:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -444,12 +444,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtINTemplateNoClockDoNotFollowLocaleDefault24kk_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", template: "kk:mm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -463,13 +463,13 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
-    
+
+
     testDateFmtINTypeDate_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "date"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -483,12 +483,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29/9/11");
         test.done();
     },
-    
+
     testDateFmtINTypeTime_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -499,15 +499,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), "1:45 pm");
         test.done();
     },
-    
+
     testDateFmtINTypeDateTime_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "datetime"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -518,16 +518,16 @@ module.exports.testdatefmt_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/9/11, 1:45 अपराह्न");
+        test.equal(fmt.format(date), "29/9/11, 1:45 pm");
         test.done();
     },
-    
-    
+
+
     testDateFmtINShortDateComponentsY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "y"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -541,12 +541,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "11");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "m"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -560,12 +560,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "9");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsN_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "n"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -579,12 +579,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "स");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsD_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "d"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -598,12 +598,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsDM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "dm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -617,12 +617,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29/9");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsMY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "my"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -636,12 +636,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "9/11");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsDMY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "dmy"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -655,12 +655,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29/9/11");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsWDM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "wdm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -674,12 +674,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "गु, 29/9");
         test.done();
     },
-    
+
     testDateFmtINShortDateComponentsWDMY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", date: "wdmy"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -693,13 +693,13 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "गु, 29/9/11");
         test.done();
     },
-    
-    
+
+
     testDateFmtINFullDateComponentsY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "y"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -713,12 +713,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "2011");
         test.done();
     },
-    
+
     testDateFmtINFullDateComponentsM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "m"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -732,12 +732,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "सितंबर");
         test.done();
     },
-    
+
     testDateFmtINFullDateComponentsD_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "d"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -751,12 +751,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtINFullDateComponentsDM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "dm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -770,12 +770,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29 सितंबर");
         test.done();
     },
-    
+
     testDateFmtINFullDateComponentsMY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "my"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -789,12 +789,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "सितंबर 2011");
         test.done();
     },
-    
+
     testDateFmtINFullDateComponentsDMY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "dmy"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -808,12 +808,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "29 सितंबर 2011");
         test.done();
     },
-    
+
     testDateFmtINFullDateComponentsWDM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "wdm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -827,12 +827,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "गुरुवार, 29 सितंबर");
         test.done();
     },
-    
+
     testDateFmtINFullDateComponentsWDMY_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full", date: "wdmy"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -846,13 +846,13 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "गुरुवार, 29 सितंबर 2011");
         test.done();
     },
-    
-    
+
+
     testDateFmtINShortTimeComponentsS_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", time: "s"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -866,12 +866,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", time: "m"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -885,12 +885,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsH_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", time: "h"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -904,13 +904,13 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
-    
+
+
     testDateFmtINShortTimeComponentsHM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", time: "hm"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -924,12 +924,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "1:45");
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsHMS_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", time: "hms"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -943,12 +943,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "1:45:37");
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsHMA_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", time: "hma"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -959,19 +959,19 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), "1:45 pm");
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsHMZ_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
+            locale: "hi-IN",
+            type: "time",
             time: "ahmsz"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -982,20 +982,20 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsHMAZ_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
-            time: "ahmsz", 
+            locale: "hi-IN",
+            type: "time",
+            time: "ahmsz",
             timezone: "Asia/Kolkata"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1006,15 +1006,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsHMSA_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", time: "hmsa"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1025,20 +1025,20 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न");
+        test.equal(fmt.format(date), '1:45:37 pm');
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsHMSZ_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
-            time: "hmsaz", 
+            locale: "hi-IN",
+            type: "time",
+            time: "hmsaz",
             timezone: "Asia/Kolkata"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1049,20 +1049,20 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
+
     testDateFmtINShortTimeComponentsHMSAZ_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
-            time: "hmsaz", 
+            locale: "hi-IN",
+            type: "time",
+            time: "hmsaz",
             timezone: "Asia/Kolkata"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1073,16 +1073,16 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
-    
+
+
     testDateFmtINFullTimeComponentsS_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", length: "full", time: "s"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1096,12 +1096,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtINFullTimeComponentsM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", length: "full", time: "m"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1115,12 +1115,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtINFullTimeComponentsH_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", length: "full", time: "h"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1134,14 +1134,14 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.format(date), "1");
         test.done();
     },
-    
-    
-    
+
+
+
     testDateFmtINFullTimeComponentsHM_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", length: "full", time: "hma"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1152,15 +1152,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), "1:45 pm");
         test.done();
     },
-    
+
     testDateFmtINFullTimeComponentsHMS_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", length: "full", time: "hmsa"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1171,15 +1171,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न");
+        test.equal(fmt.format(date), '1:45:37 pm');
         test.done();
     },
-    
+
     testDateFmtINFullTimeComponentsHMA_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", length: "full", time: "hma"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1190,23 +1190,23 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45 अपराह्न");
+        test.equal(fmt.format(date), "1:45 pm");
         test.done();
     },
-    
-    
-    
+
+
+
     testDateFmtINFullTimeComponentsHMAZ_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
-            length: "full", 
-            time: "ahmsz", 
+            locale: "hi-IN",
+            type: "time",
+            length: "full",
+            time: "ahmsz",
             timezone: "Asia/Kolkata"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1217,15 +1217,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
+
     testDateFmtINFullTimeComponentsHMSA_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", type: "time", length: "full", time: "hmsa"});
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1236,21 +1236,21 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न");
+        test.equal(fmt.format(date), '1:45:37 pm');
         test.done();
     },
-    
+
     testDateFmtINFullTimeComponentsHMSZ_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
-            length: "full", 
-            time: "hmsaz", 
+            locale: "hi-IN",
+            type: "time",
+            length: "full",
+            time: "hmsaz",
             timezone: "Asia/Kolkata"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1261,21 +1261,21 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
+
     testDateFmtINFullTimeComponentsHMSAZ_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
-            length: "full", 
-            time: "hmsaz", 
+            locale: "hi-IN",
+            type: "time",
+            length: "full",
+            time: "hmsaz",
             timezone: "Asia/Kolkata"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1286,21 +1286,21 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
+
     testDateFmtINWithTimeZoneAndNoDST_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "hi-IN", 
-            type: "time", 
-            length: "full", 
-            time: "hmsaz", 
+            locale: "hi-IN",
+            type: "time",
+            length: "full",
+            time: "hmsaz",
             timezone: "Asia/Kolkata"
         });
         test.ok(typeof(fmt) !== "undefined");
-        
+
         var date = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1311,15 +1311,15 @@ module.exports.testdatefmt_hi_IN = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "1:45:37 अपराह्न IST");
+        test.equal(fmt.format(date), '1:45:37 pm IST');
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinMinuteAfter_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1347,7 +1347,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1375,7 +1375,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1403,7 +1403,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1431,7 +1431,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1459,7 +1459,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1483,12 +1483,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.formatRelative(reference, date), "4 घंटे पहले");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinFortnightAfter_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1516,7 +1516,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1540,12 +1540,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.formatRelative(reference, date), "4 दिन पहले");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinQuarterAfter_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1573,7 +1573,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1597,12 +1597,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.formatRelative(reference, date), "9 सप्ताह पहले");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinTwoYearsAfter_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1630,7 +1630,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1654,12 +1654,12 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.formatRelative(reference, date), "14 माह पहले");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeYearsAfter_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1687,7 +1687,7 @@ module.exports.testdatefmt_hi_IN = {
         test.expect(2);
         var fmt = new DateFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "hi-IN",
             year: 2011,
@@ -1711,7 +1711,7 @@ module.exports.testdatefmt_hi_IN = {
         test.equal(fmt.formatRelative(reference, date), "21 वर्ष पहले");
         test.done();
     }
-    
-    
-    
+
+
+
 };
diff --git a/js/test/date/testdatefmt_mn_Cyrl_MN.js b/js/test/date/testdatefmt_mn_Cyrl_MN.js
index 5f999cec8f..b57e41d2b3 100644
--- a/js/test/date/testdatefmt_mn_Cyrl_MN.js
+++ b/js/test/date/testdatefmt_mn_Cyrl_MN.js
@@ -98,7 +98,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09.29");
+        test.equal(fmt.format(date), '2011 оны есдүгээр сарын 29');
         test.done();
     },
 
@@ -117,7 +117,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09.29");
+        test.equal(fmt.format(date), '2011 оны есдүгээр сарын 29');
         test.done();
     },
 
@@ -250,7 +250,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09.29 13:45");
+        test.equal(fmt.format(date), '2011 оны есдүгээр сарын 29 13:45');
         test.done();
     },
 
@@ -269,7 +269,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09.29 13:45");
+        test.equal(fmt.format(date), '2011 оны есдүгээр сарын 29 13:45');
         test.done();
     },
 
@@ -672,7 +672,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "09.29, Пү");
+        test.equal(fmt.format(date), '09.29, Пү гараг');
         test.done();
     },
 
@@ -691,7 +691,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09.29, Пү");
+        test.equal(fmt.format(date), '2011.09.29, Пү гараг');
         test.done();
     },
 
@@ -730,7 +730,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "9");
+        test.equal(fmt.format(date), 'Есдүгээр сар');
         test.done();
     },
 
@@ -768,7 +768,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "09.29");
+        test.equal(fmt.format(date), 'есдүгээр сарын 29');
         test.done();
     },
 
@@ -787,7 +787,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09");
+        test.equal(fmt.format(date), '2011 оны Есдүгээр сар');
         test.done();
     },
 
@@ -806,7 +806,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09.29");
+        test.equal(fmt.format(date), '2011 оны есдүгээр сарын 29');
         test.done();
     },
 
@@ -825,7 +825,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "09.29, пүрэв");
+        test.equal(fmt.format(date), 'есдүгээр сарын 29, пүрэв гараг');
         test.done();
     },
 
@@ -844,7 +844,7 @@ module.exports.testdatefmt_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "2011.09.29, пүрэв");
+        test.equal(fmt.format(date), '2011 оны есдүгээр сарын 29, пүрэв гараг');
         test.done();
     },
 
diff --git a/js/test/date/testdatefmt_pt_BR.js b/js/test/date/testdatefmt_pt_BR.js
index efe9cf8db1..53eb9ebcb0 100644
--- a/js/test/date/testdatefmt_pt_BR.js
+++ b/js/test/date/testdatefmt_pt_BR.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmt_pt_BR.js - test the date formatter object in Brazilian Portuguese
- * 
+ *
  * Copyright © 2012-2015,2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,17 +39,17 @@ module.exports.testdatefmt_pt_BR = {
     testDateFmtBRConstructorEmpty: function(test) {
         test.expect(1);
         var fmt = new DateFmt({locale: "pt-BR"});
-        
+
         test.ok(fmt !== null);
         test.done();
     },
-    
-    
+
+
     testDateFmtBRSimpleShort: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -63,12 +63,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29/09/2011");
         test.done();
     },
-    
+
     testDateFmtBRSimpleMedium: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -79,15 +79,15 @@ module.exports.testdatefmt_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 de set de 2011");
+        test.equal(fmt.format(date), '29 de set. de 2011');
         test.done();
     },
-    
+
     testDateFmtBRSimpleLong: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -101,12 +101,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29 de setembro de 2011");
         test.done();
     },
-    
+
     testDateFmtBRSimpleFull: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -120,12 +120,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29 de setembro de 2011");
         test.done();
     },
-    
+
     testDateFmtBRSimpleTimeShort: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "short", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -139,12 +139,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRSimpleTimeMedium: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "medium", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -158,12 +158,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRSimpleTimeLong: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", timelength: "long", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -177,12 +177,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRSimpleTimeFull: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -196,12 +196,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRDateTimeSimpleShort: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "short", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -215,12 +215,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29/09/2011 13:45");
         test.done();
     },
-    
+
     testDateFmtBRDateTimeSimpleMedium: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "medium", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -231,15 +231,15 @@ module.exports.testdatefmt_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 de set de 2011 13:45");
+        test.equal(fmt.format(date), '29 de set. de 2011 13:45');
         test.done();
     },
-    
+
     testDateFmtBRDateTimeSimpleLong: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "long", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -253,12 +253,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29 de setembro de 2011 13:45");
         test.done();
     },
-    
+
     testDateFmtBRDateTimeSimpleFull: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -272,13 +272,13 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29 de setembro de 2011 13:45");
         test.done();
     },
-    
-    
+
+
     testDateFmtBRTemplateCalendar: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", calendar: "julian", template: "yyyy-MM-dd"});
         test.ok(fmt !== null);
-        
+
         var date = new JulianDate({
             year: 2011,
             month: 9,
@@ -291,12 +291,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "2011-09-29");
         test.done();
     },
-    
+
     testDateFmtBRTemplateCalendarIncompatibleDateType: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", calendar: "julian", template: "yyyy-MM-dd HH:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -311,12 +311,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "2011-09-16 13:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateClock12SwitchHH: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", clock: "12", template: "HH:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -330,12 +330,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateClock12Switchkk: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", clock: "12", template: "kk:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -349,12 +349,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateClock24Switchhh: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", clock: "24", template: "hh:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -368,12 +368,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateClock24SwitchKK: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", clock: "24", template: "KK:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -387,12 +387,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateNoClockDoNotFollowLocaleDefault12hh: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", template: "hh:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -406,12 +406,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateNoClockDoNotFollowLocaleDefault12KK: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", template: "KK:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -425,12 +425,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateNoClockDoNotFollowLocaleDefault24HH: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", template: "HH:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -444,12 +444,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRTemplateNoClockDoNotFollowLocaleDefault24kk: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", template: "kk:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -463,13 +463,13 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
-    
+
+
     testDateFmtBRTypeDate: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "date"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -483,12 +483,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29/09/2011");
         test.done();
     },
-    
+
     testDateFmtBRTypeTime: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -502,12 +502,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRTypeDateTime: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -521,13 +521,13 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29/09/2011 13:45");
         test.done();
     },
-    
-    
+
+
     testDateFmtBRShortDateComponentsY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "y"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -541,12 +541,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "2011");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -560,12 +560,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "09");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "n"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -579,12 +579,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "s");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "d"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -598,12 +598,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsDM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "dm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -617,12 +617,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29/09");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsMY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "my"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -636,12 +636,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "09/2011");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsDMY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "dmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -655,12 +655,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29/09/2011");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsWDM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "wdm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -674,12 +674,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "Q, 29/09");
         test.done();
     },
-    
+
     testDateFmtBRShortDateComponentsWDMY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -693,13 +693,13 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "Q, 29/09/2011");
         test.done();
     },
-    
-    
+
+
     testDateFmtBRFullDateComponentsY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "y"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -713,12 +713,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "2011");
         test.done();
     },
-    
+
     testDateFmtBRFullDateComponentsM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -732,12 +732,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "setembro");
         test.done();
     },
-    
+
     testDateFmtBRFullDateComponentsD: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "d"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -751,12 +751,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtBRFullDateComponentsDM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "dm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -770,12 +770,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29 de setembro");
         test.done();
     },
-    
+
     testDateFmtBRFullDateComponentsMY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "my"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -789,12 +789,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "setembro de 2011");
         test.done();
     },
-    
+
     testDateFmtBRFullDateComponentsDMY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "dmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -808,12 +808,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "29 de setembro de 2011");
         test.done();
     },
-    
+
     testDateFmtBRFullDateComponentsWDM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "wdm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -827,12 +827,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "quinta-feira, 29 de setembro");
         test.done();
     },
-    
+
     testDateFmtBRFullDateComponentsWDMY: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", length: "full", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -846,13 +846,13 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "quinta-feira, 29 de setembro de 2011");
         test.done();
     },
-    
-    
+
+
     testDateFmtBRShortTimeComponentsS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "s"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -866,12 +866,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -885,12 +885,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsH: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "h"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -904,12 +904,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsMS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "ms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -923,12 +923,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "45:37");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "hm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -942,12 +942,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHMS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "hms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -961,12 +961,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHMA: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "hma"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -980,17 +980,17 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHMZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            time: "hmz", 
+            locale: "pt-BR",
+            type: "time",
+            time: "hmz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1004,17 +1004,17 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45 -03/-02");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHMAZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            time: "hmaz", 
+            locale: "pt-BR",
+            type: "time",
+            time: "hmaz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1028,12 +1028,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45 -03/-02");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHMSA: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", time: "hmsa"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1047,17 +1047,17 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHMSZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            time: "hmsz", 
+            locale: "pt-BR",
+            type: "time",
+            time: "hmsz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1071,17 +1071,17 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37 -03/-02");
         test.done();
     },
-    
+
     testDateFmtBRShortTimeComponentsHMSAZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            time: "hmsaz", 
+            locale: "pt-BR",
+            type: "time",
+            time: "hmsaz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1095,13 +1095,13 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37 -03/-02");
         test.done();
     },
-    
-    
+
+
     testDateFmtBRFullTimeComponentsS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "s"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1115,12 +1115,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1134,12 +1134,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsH: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "h"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1153,12 +1153,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsMS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "ms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1172,12 +1172,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "45:37");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHM: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "hm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1191,12 +1191,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHMS: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "hms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1210,12 +1210,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHMA: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "hma"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1229,18 +1229,18 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHMZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            length: "full", 
-            time: "hmz", 
+            locale: "pt-BR",
+            type: "time",
+            length: "full",
+            time: "hmz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1254,18 +1254,18 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45 -03/-02");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHMAZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            length: "full", 
-            time: "hmaz", 
+            locale: "pt-BR",
+            type: "time",
+            length: "full",
+            time: "hmaz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1279,12 +1279,12 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45 -03/-02");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHMSA: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "pt-BR", type: "time", length: "full", time: "hmsa"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1298,18 +1298,18 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHMSZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            length: "full", 
-            time: "hmsz", 
+            locale: "pt-BR",
+            type: "time",
+            length: "full",
+            time: "hmsz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1323,18 +1323,18 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37 -03/-02");
         test.done();
     },
-    
+
     testDateFmtBRFullTimeComponentsHMSAZ: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            length: "full", 
-            time: "hmsaz", 
+            locale: "pt-BR",
+            type: "time",
+            length: "full",
+            time: "hmsaz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1348,18 +1348,18 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37 -03/-02");
         test.done();
     },
-    
+
     testDateFmtBRWithTimeZoneAndNoDST: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "pt-BR", 
-            type: "time", 
-            length: "full", 
-            time: "hmsz", 
+            locale: "pt-BR",
+            type: "time",
+            length: "full",
+            time: "hmsz",
             timezone: "America/Sao_Paulo"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "pt-BR",
             year: 2011,
@@ -1373,6 +1373,6 @@ module.exports.testdatefmt_pt_BR = {
         test.equal(fmt.format(date), "13:45:37 -03/-02");
         test.done();
     }
-    
-    
+
+
 };
diff --git a/js/test/date/testdatefmt_sw_KE.js b/js/test/date/testdatefmt_sw_KE.js
index 9b3e1b6cb2..f2ec63686d 100644
--- a/js/test/date/testdatefmt_sw_KE.js
+++ b/js/test/date/testdatefmt_sw_KE.js
@@ -213,7 +213,7 @@ module.exports.testdatefmt_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/09/2011, 13:45");
+        test.equal(fmt.format(date), '29/09/2011 13:45');
         test.done();
     },
 
@@ -232,7 +232,7 @@ module.exports.testdatefmt_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 Sep 2011, 13:45");
+        test.equal(fmt.format(date), '29 Sep 2011 13:45');
         test.done();
     },
 
@@ -252,7 +252,7 @@ module.exports.testdatefmt_sw_KE = {
             millisecond: 0
         });
 
-        test.equal(fmt.format(date), "29 Septemba 2011 saa 13:45");
+        test.equal(fmt.format(date), '29 Septemba 2011 13:45');
         test.done();
     },
 
@@ -271,7 +271,7 @@ module.exports.testdatefmt_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29 Septemba 2011 saa 13:45");
+        test.equal(fmt.format(date), '29 Septemba 2011 13:45');
         test.done();
     },
 
@@ -503,7 +503,7 @@ module.exports.testdatefmt_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "29/09/2011, 13:45");
+        test.equal(fmt.format(date), '29/09/2011 13:45');
         test.done();
     },
 
diff --git a/js/test/date/testdatefmt_vi_VN.js b/js/test/date/testdatefmt_vi_VN.js
index 9dedcbb545..d3deab6c23 100644
--- a/js/test/date/testdatefmt_vi_VN.js
+++ b/js/test/date/testdatefmt_vi_VN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmt_de_DE.js - test the date formatter object in German
- * 
+ *
  * Copyright © 2012-2015,2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,17 +39,17 @@ module.exports.testdatefmt_vi_VN = {
     testDateFmtConstructorEmpty_vi_VN: function(test) {
         test.expect(1);
         var fmt = new DateFmt({locale: "vi-VN"});
-        
+
         test.ok(fmt !== null);
         test.done();
     },
-    
-    
+
+
     testDateFmtSimpleShort_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -63,12 +63,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29/09/2011");
         test.done();
     },
-    
+
     testDateFmtSimpleMedium_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -82,12 +82,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29 thg 9, 2011");
         test.done();
     },
-    
+
     testDateFmtSimpleLong_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -101,12 +101,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29 tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtSimpleFull_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -120,12 +120,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29 tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtAllComponentsShort_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "short", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -139,12 +139,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "T5, 29/09/2011");
         test.done();
     },
-    
+
     testDateFmtAllComponentsMedium_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "medium", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -158,12 +158,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "T5, 29 thg 9, 2011");
         test.done();
     },
-    
+
     testDateFmtAllComponentsLong_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "long", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -177,12 +177,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "Th 5, 29 tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtAllComponentsFull_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -196,12 +196,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "Thứ Năm, 29 tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtSimpleTimeShort_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "short", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -215,12 +215,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtSimpleTimeMedium_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "medium", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -234,12 +234,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtSimpleTimeLong_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", timelength: "long", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -253,12 +253,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtSimpleTimeFull_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -272,12 +272,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleShort_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "short", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -291,12 +291,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45, 29/09/2011");
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleMedium_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "medium", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -310,12 +310,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45, 29 thg 9, 2011");
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleLong_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "long", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -329,12 +329,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45 29 tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtDateTimeSimpleFull_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -348,12 +348,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45 29 tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtTemplateCalendar_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", calendar: "julian", template: "yyyy-MM-dd"});
         test.ok(fmt !== null);
-        
+
         var date = new JulianDate({
             locale: "vi-VN",
             year: 2011,
@@ -367,12 +367,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "2011-09-29");
         test.done();
     },
-    
+
     testDateFmtTemplateClock12SwitchHH_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", clock: "12", template: "HH:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -386,12 +386,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateClock12Switchkk_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", clock: "12", template: "kk:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -405,12 +405,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateClock24Switchhh_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", clock: "24", template: "hh:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -424,12 +424,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtTemplateClock24SwitchKK_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", clock: "24", template: "KK:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -443,12 +443,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockNotFollowLocaleDefault12hh_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", template: "hh:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -462,12 +462,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockNotFollowLocaleDefault12KK_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", template: "KK:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -481,12 +481,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "01:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockNotFollowLocaleDefault24HH_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", template: "HH:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -500,12 +500,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtTemplateNoClockNotFollowLocaleDefault24kk_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", template: "kk:mm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -519,13 +519,13 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
-    
+
+
     testDateFmtTypeDate_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "date"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -539,12 +539,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29/09/2011");
         test.done();
     },
-    
+
     testDateFmtTypeTime_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -558,12 +558,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtTypeDateTime_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "datetime"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -577,13 +577,13 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45, 29/09/2011");
         test.done();
     },
-    
-    
+
+
     testDateFmtShortDateComponentsY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "y"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -597,12 +597,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "2011");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -616,12 +616,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "Th 9");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsN_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "n"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -632,15 +632,15 @@ module.exports.testdatefmt_vi_VN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "t 9");
+        test.equal(fmt.format(date), 't9');
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsD_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "d"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -654,12 +654,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsDM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "dm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -673,12 +673,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29/09");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsMY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "my"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -692,12 +692,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "09/2011");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsDMY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "dmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -711,12 +711,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29/09/2011");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsWDM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "wdm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -730,12 +730,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "T5, 29/09");
         test.done();
     },
-    
+
     testDateFmtShortDateComponentsWDMY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -749,13 +749,13 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "T5, 29/09/2011");
         test.done();
     },
-    
-    
+
+
     testDateFmtFullDateComponentsY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "y"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -769,12 +769,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "2011");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -788,12 +788,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "Tháng 9");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsD_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "d"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -807,12 +807,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsDM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "dm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -826,12 +826,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29 tháng 9");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsMY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "my"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -845,12 +845,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "Tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsDMY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "dmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -864,12 +864,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "29 tháng 9, 2011");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsWDM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "wdm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -883,12 +883,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "Thứ Năm, 29 tháng 9");
         test.done();
     },
-    
+
     testDateFmtFullDateComponentsWDMY_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full", date: "wdmy"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -902,13 +902,13 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "Thứ Năm, 29 tháng 9, 2011");
         test.done();
     },
-    
-    
+
+
     testDateFmtShortTimeComponentsS_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "s"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -922,12 +922,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -941,12 +941,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsH_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "h"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -960,12 +960,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsMS_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "ms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -979,12 +979,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "45:37");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "hm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -998,12 +998,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMS_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "hms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1017,12 +1017,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMA_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "hma"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1036,16 +1036,16 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
+            locale: "vi-VN",
+            type: "time",
             time: "hmz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1059,16 +1059,16 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45 +07");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMAZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
+            locale: "vi-VN",
+            type: "time",
             time: "hmaz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1082,12 +1082,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45 +07");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMSA_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", time: "hmsa"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1101,16 +1101,16 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMSZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
+            locale: "vi-VN",
+            type: "time",
             time: "hmsz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1124,16 +1124,16 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37 +07");
         test.done();
     },
-    
+
     testDateFmtShortTimeComponentsHMSAZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
+            locale: "vi-VN",
+            type: "time",
             time: "hmsaz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1147,13 +1147,13 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37 +07");
         test.done();
     },
-    
-    
+
+
     testDateFmtFullTimeComponentsS_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "s"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1167,12 +1167,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "37");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "m"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1186,12 +1186,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "45");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsH_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "h"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1205,12 +1205,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsMS_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "ms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1224,12 +1224,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "45:37");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHM_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "hm"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1243,12 +1243,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMS_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "hms"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1262,12 +1262,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMA_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "hma"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1281,17 +1281,17 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
-            length: "full", 
+            locale: "vi-VN",
+            type: "time",
+            length: "full",
             time: "hmz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1305,17 +1305,17 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45 +07");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMAZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
-            length: "full", 
+            locale: "vi-VN",
+            type: "time",
+            length: "full",
             time: "hmaz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1329,12 +1329,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45 +07");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMSA_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", type: "time", length: "full", time: "hmsa"});
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1348,17 +1348,17 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMSZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
-            length: "full", 
+            locale: "vi-VN",
+            type: "time",
+            length: "full",
             time: "hmsz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1372,17 +1372,17 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37 +07");
         test.done();
     },
-    
+
     testDateFmtFullTimeComponentsHMSAZ_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
-            length: "full", 
+            locale: "vi-VN",
+            type: "time",
+            length: "full",
             time: "hmsaz"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1396,18 +1396,18 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37 +07");
         test.done();
     },
-    
+
     testDateFmtWithTimeZoneAndNoDST_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({
-            locale: "vi-VN", 
-            type: "time", 
-            length: "full", 
+            locale: "vi-VN",
+            type: "time",
+            length: "full",
             time: "hmsz",
             timezone: "Asia/Ho_Chi_Minh"
         });
         test.ok(fmt !== null);
-        
+
         var date = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1421,12 +1421,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.format(date), "13:45:37 +07");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinMinuteAfter_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1450,12 +1450,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.formatRelative(reference, date), "sau 30 giây nữa");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinHourAfter_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1479,12 +1479,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.formatRelative(reference, date), "sau 10 phút nữa");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinDayAfter_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1508,12 +1508,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.formatRelative(reference, date), "sau 4 giờ nữa");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeWithinFortnightAfter_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1537,13 +1537,13 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.formatRelative(reference, date), "sau 4 ngày nữa");
         test.done();
     },
-    
-    
+
+
     testDateFmtFormatRelativeWithinQuarterAfter_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1567,13 +1567,13 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.formatRelative(reference, date), "sau 9 tuần nữa");
         test.done();
     },
-    
-    
+
+
     testDateFmtFormatRelativeWithinTwoYearsAfter_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1597,12 +1597,12 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.formatRelative(reference, date), "sau 16 tháng nữa");
         test.done();
     },
-    
+
     testDateFmtFormatRelativeYearsAfter_vi_VN: function(test) {
         test.expect(2);
         var fmt = new DateFmt({locale: "vi-VN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var reference = new GregorianDate({
             locale: "vi-VN",
             year: 2011,
@@ -1626,7 +1626,7 @@ module.exports.testdatefmt_vi_VN = {
         test.equal(fmt.formatRelative(reference, date), "sau 14 năm nữa");
         test.done();
     }
-    
-    
-    
+
+
+
 };
diff --git a/js/test/date/testdatetimefmt.js b/js/test/date/testdatetimefmt.js
index 93af844f9b..2ad5c635b2 100644
--- a/js/test/date/testdatetimefmt.js
+++ b/js/test/date/testdatetimefmt.js
@@ -154,11 +154,11 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"bg-BG", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"bg-BG", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM yyyy 'г'., H:mm 'ч'.");
-        test.equal(result2, "E, d.MM.yy 'г'., H:mm 'ч'.");
+        test.equal(result1, 'EEEE, d MMMM yyyy \'г\'., H:mm');
+        test.equal(result2, 'E, d.MM.yy \'г\'., H:mm');
 
         result1 = new DateFmt({locale:"bg-BG", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
-        test.equal(result1, "H:mm:ss 'ч'. z"); // CLDR 34 change.
+        test.equal(result1, 'H:mm:ss z');
 
         test.done();
     },
@@ -1148,7 +1148,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-AR", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-AR", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-AR", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1174,7 +1174,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-BO", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-BO", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-BO", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1200,7 +1200,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-CL", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-CL", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, dd-MM-yy HH:mm");
 
         result1 = new DateFmt({locale:"es-CL", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1226,7 +1226,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-CO", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-CO", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' h:mm a');
         test.equal(result2, "E, d/MM/yy, h:mm a");
 
         result1 = new DateFmt({locale:"es-CO", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1252,7 +1252,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-DO", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-DO", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' h:mm a');
         test.equal(result2, "E, d/M/yy h:mm a");
 
         result1 = new DateFmt({locale:"es-DO", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1278,7 +1278,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-EC", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-EC", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-EC", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1330,7 +1330,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-GT", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-GT", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/MM/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-GT", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1356,7 +1356,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-HN", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-HN", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE dd 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE dd \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-HN", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1382,7 +1382,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-MX", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-MX", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, H:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' H:mm');
         test.equal(result2, "E, dd/MM/yy H:mm");
 
         result1 = new DateFmt({locale:"es-MX", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1408,7 +1408,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-NI", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-NI", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-NI", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1434,7 +1434,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-PA", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-PA", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' h:mm a');
         test.equal(result2, "E, MM/dd/yy h:mm a");
 
         result1 = new DateFmt({locale:"es-PA", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1459,7 +1459,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-PE", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-PE", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/MM/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-PE", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1485,7 +1485,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-PR", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-PR", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' h:mm a');
         test.equal(result2, "E, MM/dd/yy h:mm a");
 
         result1 = new DateFmt({locale:"es-PR", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1511,7 +1511,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-PY", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-PY", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-PY", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1537,7 +1537,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-SV", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-SV", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-SV", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1563,7 +1563,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-US", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-US", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' h:mm a');
         test.equal(result2, "E, d/M/yyyy h:mm a");
 
         result1 = new DateFmt({locale:"es-US", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1589,7 +1589,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-UY", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-UY", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-UY", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1615,7 +1615,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-VE", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-VE", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, h:mm a");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' h:mm a');
         test.equal(result2, "E, d/M/yy h:mm a");
 
         result1 = new DateFmt({locale:"es-VE", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
@@ -1766,13 +1766,13 @@ module.exports.testdatetimeformat = {
         test.equal(result1, "EEEE d MMMM yyyy");
         test.equal(result2, "EEE d MMMM yyyy");
         test.equal(result3, "EE d MMM yyyy");
-        test.equal(result4, "E yy-MM-dd");
+        test.equal(result4, 'E yyyy-MM-dd');
 
         result1 = new DateFmt({locale:"fr-CA", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"fr-CA", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
         test.equal(result1, "EEEE d MMMM yyyy 'à' HH 'h' mm");
-        test.equal(result2, "E yy-MM-dd HH 'h' mm"); // CLDR 34 change
+        test.equal(result2, 'E yyyy-MM-dd HH \'h\' mm');
 
         result1 = new DateFmt({locale:"fr-CA", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH 'h' mm 'min' ss 's' z");
@@ -2335,16 +2335,16 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"mk-MK", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"mk-MK", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, dd MMMM yyyy");
-        test.equal(result2, "EEE, dd MMMM yyyy");
-        test.equal(result3, "EE, dd.M.yyyy");
-        test.equal(result4, "E, dd.M.yy");
+        test.equal(result1, 'EEEE, d MMMM yyyy');
+        test.equal(result2, 'EEE, d MMMM yyyy');
+        test.equal(result3, 'EE, d.M.yyyy');
+        test.equal(result4, 'E, d.M.yy');
 
         result1 = new DateFmt({locale:"mk-MK", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"mk-MK", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, dd MMMM yyyy HH:mm");
-        test.equal(result2, "E, dd.M.yy HH:mm");
+        test.equal(result1, 'EEEE, d MMMM yyyy HH:mm');
+        test.equal(result2, 'E, d.M.yy HH:mm');
 
         result1 = new DateFmt({locale:"mk-MK", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -2429,6 +2429,52 @@ module.exports.testdatetimeformat = {
 
         test.done();
     },
+    testDateTimeFormat_ms_BN: function(test) {
+        test.expect(15);
+
+        var result1, result2, result3, result4;
+
+        result1 = new DateFmt({locale:"ms-BN", type:"date", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
+        result2 = new DateFmt({locale:"ms-BN", type:"date", date:"dmwy", length: "long", useNative:false, timezone:"local"}).template;
+        result3 = new DateFmt({locale:"ms-BN", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
+        result4 = new DateFmt({locale:"ms-BN", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
+
+        test.equal(result1, "EEEE dd MMMM yyyy");
+        test.equal(result2, "EEE d MMMM yyyy");
+        test.equal(result3, "EE d MMM yyyy");
+        test.equal(result4, "E d/MM/yy");
+
+        result1 = new DateFmt({locale:"ms-BN", type:"date", date:"dmw", length: "full", useNative:false, timezone:"local"}).template;
+        result2 = new DateFmt({locale:"ms-BN", type:"date", date:"dmw", length: "long", useNative:false, timezone:"local"}).template;
+        result3 = new DateFmt({locale:"ms-BN", type:"date", date:"dmw", length: "medium", useNative:false, timezone:"local"}).template;
+        result4 = new DateFmt({locale:"ms-BN", type:"date", date:"dmw", length: "short", useNative:false, timezone:"local"}).template;
+
+        test.equal(result1, "EEEE dd MMMM");
+        test.equal(result2, "EEE d MMMM");
+        test.equal(result3, "EE d MMM");
+        test.equal(result4, "E d/MM");
+
+        result1 = new DateFmt({locale:"ms-BN", type:"date", date:"dw", length: "full", useNative:false, timezone:"local"}).template;
+        result2 = new DateFmt({locale:"ms-BN", type:"date", date:"dw", length: "long", useNative:false, timezone:"local"}).template;
+        result3 = new DateFmt({locale:"ms-BN", type:"date", date:"dw", length: "medium", useNative:false, timezone:"local"}).template;
+        result4 = new DateFmt({locale:"ms-BN", type:"date", date:"dw", length: "short", useNative:false, timezone:"local"}).template;
+
+        test.equal(result1, "EEEE dd");
+        test.equal(result2, "EEE d");
+        test.equal(result3, "EE d");
+        test.equal(result4, "E d");
+
+        result1 = new DateFmt({locale:"ms-BN", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
+        result2 = new DateFmt({locale:"ms-BN", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
+
+        test.equal(result1, "EEEE dd MMMM yyyy h:mm a");
+        test.equal(result2, "E d/MM/yy, h:mm a"); //CLDR 34 change.
+
+        result1 = new DateFmt({locale:"ms-BN", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
+        test.equal(result1, "h:mm:ss a z");
+
+        test.done();
+    },
     testDateTimeFormat_nb_NO: function(test) {
         test.expect(8);
 
@@ -2962,16 +3008,16 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"sv-FI", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"sv-FI", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE d MMMM yyyy");
-        test.equal(result2, "EEE d MMMM yyyy");
-        test.equal(result3, "EE d MMM yyyy");
-        test.equal(result4, "E dd-MM-yyyy");
+        test.equal(result1, 'EEEE d MMMM yyyy');
+        test.equal(result2, 'EEE d MMMM yyyy');
+        test.equal(result3, 'EE d MMM yyyy');
+        test.equal(result4, 'E yyyy-MM-dd');
 
         result1 = new DateFmt({locale:"sv-FI", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"sv-FI", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE d MMMM yyyy HH:mm");
-        test.equal(result2, "E dd-MM-yyyy HH:mm");
+        test.equal(result1, 'EEEE d MMMM yyyy HH:mm');
+        test.equal(result2, 'E yyyy-MM-dd HH:mm');
 
         result1 = new DateFmt({locale:"sv-FI", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -3483,16 +3529,16 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"mn-Cyrl-MN", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"mn-Cyrl-MN", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "yyyy.MM.dd, EEEE"); //// CLDR 34 change
-        test.equal(result2, "yyyy.MM.dd, EEE");  //// CLDR 34 change
-        test.equal(result3, "yyyy 'оны' MMM'ын' d, EE");  //// CLDR 34 change
-        test.equal(result4, "yyyy.MM.dd, E");  //// CLDR 34 change
+        test.equal(result1, 'yyyy \'оны\' MMMM\'ын\' d, EEEE \'гараг\'');
+        test.equal(result2, 'yyyy \'оны\' MMMM\'ын\' d, EEE \'гараг\'');
+        test.equal(result3, 'yyyy \'оны\' MMM\'ын\' d, EE \'гараг\'');
+        test.equal(result4, 'yyyy.MM.dd, E \'гараг\'');
 
         result1 = new DateFmt({locale:"mn-Cyrl-MN", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"mn-Cyrl-MN", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "yyyy.MM.dd, EEEE HH:mm");
-        test.equal(result2, "yyyy.MM.dd, E HH:mm");
+        test.equal(result1, 'yyyy \'оны\' MMMM\'ын\' d, EEEE \'гараг\' HH:mm');
+        test.equal(result2, 'yyyy.MM.dd, E \'гараг\' HH:mm');
 
         result1 = new DateFmt({locale:"mn-Cyrl-MN", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1,  "HH:mm:ss (z)"); //// CLDR 34 change
@@ -3587,16 +3633,16 @@ module.exports.testdatetimeformat = {
         result3 = new DateFmt({locale:"ha-Latn-NG", type:"date", date:"dmwy", length: "medium", useNative:false, timezone:"local"}).template;
         result4 = new DateFmt({locale:"ha-Latn-NG", type:"date", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM, yyyy");
-        test.equal(result2, "EEE, d MMMM, yyyy");
-        test.equal(result3, "EE, d MMM, yyyy");
-        test.equal(result4, "E, d/M/yy");
+        test.equal(result1, 'EEEE d MMMM, yyyy');
+        test.equal(result2, 'EEE d MMMM, yyyy');
+        test.equal(result3, 'EE d MMM, yyyy');
+        test.equal(result4, 'E d/M/yy');
 
         result1 = new DateFmt({locale:"ha-Latn-NG", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"ha-Latn-NG", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d MMMM, yyyy HH:mm");
-        test.equal(result2, "E, d/M/yy HH:mm");
+        test.equal(result1, 'EEEE d MMMM, yyyy HH:mm');
+        test.equal(result2, 'E d/M/yy HH:mm');
 
         result1 = new DateFmt({locale:"ha-Latn-NG", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
         test.equal(result1, "HH:mm:ss z");
@@ -4348,7 +4394,7 @@ module.exports.testdatetimeformat = {
         result1 = new DateFmt({locale:"es-CR", type:"datetime", date:"dmwy", length: "full", useNative:false, timezone:"local"}).template;
         result2 = new DateFmt({locale:"es-CR", type:"datetime", date:"dmwy", length: "short", useNative:false, timezone:"local"}).template;
 
-        test.equal(result1, "EEEE, d 'de' MMMM 'de' yyyy, HH:mm");
+        test.equal(result1, 'EEEE, d \'de\' MMMM \'de\' yyyy \'a\' \'las\' HH:mm');
         test.equal(result2, "E, d/M/yy HH:mm");
 
         result1 = new DateFmt({locale:"es-CR", type:"time", time:"ahmsz", length:"full", useNative:false, timezone:"local"}).template;
diff --git a/js/test/daterange/testdatefmtrange_bg_BG.js b/js/test/daterange/testdatefmtrange_bg_BG.js
index cf2ff00ca9..0db6b9c9f7 100644
--- a/js/test/daterange/testdatefmtrange_bg_BG.js
+++ b/js/test/daterange/testdatefmtrange_bg_BG.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_bg_BG.js - test the date range formatter object in Bulgarian/Bulgaria
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31.12.11 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31.12.11 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31.12.2011 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31.12.2011 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 – 14:30');
         test.done();
     },
-    
+
     testDateRngFmtBGRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30.12.11 г., 13:45 ч. – 31.12.11 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30.12.11 г., 13:45 – 31.12.11 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30.12.2011 г., 13:45 ч. – 31.12.2011 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30.12.2011 г., 13:45 – 31.12.2011 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 ч. – 31 декември 2011 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 – 31 декември 2011 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,15 +239,15 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 ч. – 31 декември 2011 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 – 31 декември 2011 г., 14:30');
         test.done();
     },
-    
+
     testDateRngFmtBGRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "20 – 31 декември 2011 г.");
         test.done();
     },
-    
+
     testDateRngFmtBGRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "20 ноември – 31 декември 2011 г.");
         test.done();
     },
-    
+
     testDateRngFmtBGRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "20 ноември 2011 г. – 31 януари 2012 г.");
         test.done();
     },
-    
+
     testDateRngFmtBGRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_es_CO.js b/js/test/daterange/testdatefmtrange_es_CO.js
index 3f2b2a6590..e08be17e6e 100644
--- a/js/test/daterange/testdatefmtrange_es_CO.js
+++ b/js/test/daterange/testdatefmtrange_es_CO.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_es_CO.js - test the date range formatter object in Spanish/Columbia
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/11, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31/12/11, 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeinDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31/12/2011, 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeinDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,16 +134,16 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
-    
+
     },
-    
+
     testDateRngFmtCORangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -162,14 +162,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/11, 1:45 p. m. – 31/12/11, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30/12/11, 1:45 p. m. – 31/12/11, 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -188,14 +188,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/2011, 1:45 p. m. – 31/12/2011, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30/12/2011, 1:45 p. m. – 31/12/2011, 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -214,14 +214,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         })
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,16 +239,16 @@ module.exports.testdatefmtrange_es_CO = {
             minute: 30,
             second: 0,
             millisecond: 0
-        });           
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        });
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
-    
+
     testDateRngFmtCORangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -274,7 +274,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -300,7 +300,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -321,13 +321,13 @@ module.exports.testdatefmtrange_es_CO = {
         });
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
-    
+
     },
     testDateRngFmtCORangeMultiDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -349,12 +349,12 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtCORangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -380,7 +380,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -406,7 +406,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -432,7 +432,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -454,12 +454,12 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "20 de noviembre – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtCORangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -485,7 +485,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -511,7 +511,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -537,7 +537,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -559,12 +559,12 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "20 de noviembre de 2011 – 31 de enero de 2012");
         test.done();
     },
-    
+
     testDateRngFmtCORangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -590,7 +590,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -616,7 +616,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -642,7 +642,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -668,7 +668,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -690,5 +690,5 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_es_UY.js b/js/test/daterange/testdatefmtrange_es_UY.js
index 6eeaca2c84..c4d5f28652 100644
--- a/js/test/daterange/testdatefmtrange_es_UY.js
+++ b/js/test/daterange/testdatefmtrange_es_UY.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_es_UY.js - test the date range formatter object in French/France
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtUYRangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 13:45 – 14:30");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 13:45 – 31 de diciembre de 2011, 14:30");
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 13:45 – 31 de diciembre de 2011 a las 14:30");
         test.done();
     },
     testDateRngFmtUYRangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -238,16 +238,16 @@ module.exports.testdatefmtrange_es_UY = {
             minute: 30,
             second: 0,
             millisecond: 0
-        });           
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 13:45 – 31 de diciembre de 2011, 14:30");
+        });
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 13:45 – 31 de diciembre de 2011 a las 14:30");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "20 de noviembre – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "20 de noviembre de 2011 – 31 de enero de 2012");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_es_VE.js b/js/test/daterange/testdatefmtrange_es_VE.js
index d6c75448e2..161c007670 100644
--- a/js/test/daterange/testdatefmtrange_es_VE.js
+++ b/js/test/daterange/testdatefmtrange_es_VE.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_es_VE.js - test the date range formatter object in French/France
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/11 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31/12/11 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeinDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 dic. 2011 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 dic. 2011 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeinDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
-    
+
     testDateRngFmtVERangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/11 1:45 p. m. – 31/12/11 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30/12/11 1:45 p. m. – 31/12/11 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 dic. 2011 1:45 p. m. – 31 dic. 2011 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30 dic. 2011 1:45 p. m. – 31 dic. 2011 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -238,16 +238,16 @@ module.exports.testdatefmtrange_es_VE = {
             minute: 30,
             second: 0,
             millisecond: 0
-        });      
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        });
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
-    
+
     testDateRngFmtVERangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtVERangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "20 de noviembre – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtVERangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "20 de noviembre de 2011 – 31 de enero de 2012");
         test.done();
     },
-    
+
     testDateRngFmtVERangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_fmttemplate.js b/js/test/daterange/testdatefmtrange_fmttemplate.js
index ab831b9c7c..05cf803d08 100644
--- a/js/test/daterange/testdatefmtrange_fmttemplate.js
+++ b/js/test/daterange/testdatefmtrange_fmttemplate.js
@@ -1,7 +1,7 @@
  /*
  * testWeekdayTranslation.js
  *
- * Copyright © 2019, JEDLSoft
+ * Copyright © 2019-2020, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -3051,23 +3051,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3122,23 +3122,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} de {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3193,23 +3193,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd}-{sm}-{sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}-{sm}-{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
         test.equal(templatec01[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
         test.equal(templatec02[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
         test.equal(templatec03[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
 
@@ -3264,23 +3264,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd}/{sm}/{sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy}, {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
@@ -3334,23 +3334,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3405,23 +3405,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3547,23 +3547,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd}/{sm}/{sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3618,23 +3618,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3690,23 +3690,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}'); // CLDR 34 change
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}'); // CLDR 34 change
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}'); // CLDR 34 change
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3735,6 +3735,7 @@ module.exports.testdaterangefmt = {
         test.equal(templatec30[2], "{sy} – {ey}");
         test.equal(templatec30[3], "{sy} – {ey}");
 
+
         test.done();
     },
     testDateRngFmt_es_NI: function(test) {
@@ -3761,23 +3762,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3833,23 +3834,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sm}/{sd}/{sy} {st} – {et}');
         test.equal(templatec00[3], '{sm}/{sd}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec01[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec02[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec03[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
@@ -3904,23 +3905,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3977,23 +3978,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sm}/{sd}/{sy} {st} – {et}');
         test.equal(templatec00[3], '{sm}/{sd}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec01[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec02[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec03[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
@@ -4048,23 +4049,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4119,23 +4120,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4190,23 +4191,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4261,23 +4262,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4332,23 +4333,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -8053,42 +8054,42 @@ module.exports.testdaterangefmt = {
         test.equal(templatec00[0], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[1], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
-        test.equal(templatec00[3], '{sd}-{sm}-{sy} {st} – {et}');
+        test.equal(templatec00[3], '{sy}-{sm}-{sd} {st} – {et}');
 
         test.equal(templatec01[0], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[1], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec01[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec01[3], '{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}');
 
         test.equal(templatec02[1], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[0], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec02[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec02[3], '{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}');
 
         test.equal(templatec03[0], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[1], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec03[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec03[3], '{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}');
 
         test.equal(templatec10[0], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[1], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[2], '{sd} – {ed} {em} {ey}');
-        test.equal(templatec10[3], '{sd} – {ed}-{em}-{ey}');
+        test.equal(templatec10[3], '{sy}-{sm}-{sd} – {ed}');
 
         test.equal(templatec11[0], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[1], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[2], '{sd} {sm} – {ed} {em} {ey}');
-        test.equal(templatec11[3], '{sd}-{sm} – {ed}-{em}-{ey}');
+        test.equal(templatec11[3], '{sy}-{sm}-{sd} – {ey}-{em}-{ed}');
 
         test.equal(templatec12[0], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[1], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[2], '{sd} {sm} {sy} – {ed} {em} {ey}');
-        test.equal(templatec12[3], '{sd}-{sm}-{sy} – {ed}-{em}-{ey}');
+        test.equal(templatec12[3], '{sy}-{sm}-{sd} – {ey}-{em}-{ed}');
 
         test.equal(templatec20[0], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[1], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[3], '{sm}-{sy} – {em}-{ey}');
+        test.equal(templatec20[3], '{sy}-{sm} – {ey}-{em}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
         test.equal(templatec30[1], "{sy} – {ey}");
@@ -8195,7 +8196,6 @@ module.exports.testdaterangefmt = {
         }
 
         test.equal(templatec00[0], '{sd} {sm}, {sy} அன்று {st} – {et}');
-                                   '{sd} {sm}, {sy} ’அன்று’ {st} – {et}'
         test.equal(templatec00[1], '{sd} {sm}, {sy} அன்று {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm}, {sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy}, {st} – {et}');
@@ -8212,7 +8212,6 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec03[0], '{sd} {sm}, {sy} அன்று {st} – {ed} {em}, {ey} அன்று {et}');
         test.equal(templatec03[1], '{sd} {sm}, {sy} அன்று {st} – {ed} {em}, {ey} அன்று {et}');
-                                   '{sd} {sm}, {sy} ’அன்று’ {st} – {ed} {em}, {ey} ’அன்று’ {et}'
         test.equal(templatec03[2], '{sd} {sm}, {sy}, {st} – {ed} {em}, {ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
@@ -8267,7 +8266,7 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd}, {sm} {sy} {st}కి – {et}కి'); // CLDR 34 change
+        test.equal(templatec00[0], '{sd}, {sm} {sy} {st}కి – {et}కి');
         test.equal(templatec00[1], '{sd} {sm}, {sy} {st}కి – {et}కి');
 
         test.equal(templatec00[2], '{sd} {sm}, {sy} {st} – {et}');
@@ -9485,45 +9484,44 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sy}.{sm}.{sd} {st} – {et}');
-        test.equal(templatec00[1], '{sy}.{sm}.{sd} {st} – {et}');
+        test.equal(templatec00[0], '{sy} оны {sm}ын {sd} {st} – {et}');
+        test.equal(templatec00[1], '{sy} оны {sm}ын {sd} {st} – {et}');
         test.equal(templatec00[2], '{sy} оны {sm}ын {sd} {st} – {et}');
         test.equal(templatec00[3], '{sy}.{sm}.{sd} {st} – {et}');
 
-        test.equal(templatec01[0], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
-        test.equal(templatec01[1], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
+        test.equal(templatec01[0], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
+        test.equal(templatec01[1], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec01[2], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec01[3], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
 
-        test.equal(templatec02[1], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
-        test.equal(templatec02[0], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
+        test.equal(templatec02[1], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
+        test.equal(templatec02[0], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec02[2], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec02[3], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
 
-        test.equal(templatec03[0], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
-        test.equal(templatec03[1], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
+        test.equal(templatec03[0], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
+        test.equal(templatec03[1], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec03[2], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec03[3], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
 
-        test.equal(templatec10[0], '{sy}.{sm}.{sd} – {ed}');
-        test.equal(templatec10[1], '{sy}.{sm}.{sd} – {ed}');
+        test.equal(templatec10[0], '{sy} оны {sm}ын {sd} – {ed}' );
+        test.equal(templatec10[1], '{sy} оны {sm}ын {sd} – {ed}');
         test.equal(templatec10[2], '{sy} оны {sm}ын {sd} – {ed}');
         test.equal(templatec10[3], '{sy}.{sm}.{sd} – {ed}');
 
-        test.equal(templatec11[0], '{sy}.{sm}.{sd} – {em}.{ed}');
-        test.equal(templatec11[1], '{sy}.{sm}.{sd} – {em}.{ed}');
+        test.equal(templatec11[0], '{sy} оны {sm}ын {sd} – {em}ын {ed}');
+        test.equal(templatec11[1], '{sy} оны {sm}ын {sd} – {em}ын {ed}');
         test.equal(templatec11[2], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
         test.equal(templatec11[3], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
 
-        test.equal(templatec12[0], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
-        test.equal(templatec12[1], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
+        test.equal(templatec12[0], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
+        test.equal(templatec12[1], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
         test.equal(templatec12[2], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
         test.equal(templatec12[3], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
 
-        test.equal(templatec20[0], '{sy}.{sm} – {ey}.{em}');
-        test.equal(templatec20[1], '{sy}.{sm} – {ey}.{em}');
-        test.equal(templatec20[2], '{sy} оны {sm}ын – {ey} оны {em}ын');
-                                   '{sy} оны {sm} – {ey} оны {em}'
+        test.equal(templatec20[0], '{sy} оны {sm} – {ey} оны {em}');
+        test.equal(templatec20[1], '{sy} оны {sm} – {ey} оны {em}');
+        test.equal(templatec20[2], '{sy} оны {sm} – {ey} оны {em}');
         test.equal(templatec20[3], '{sy}.{sm} – {ey}.{em}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
@@ -9843,7 +9841,7 @@ module.exports.testdaterangefmt = {
             templatec20.push(fmt.dateFmt.formats.range["c20"][abbrLength[i]]);
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
-        //// CLDR 34 change ////
+
         test.equal(templatec00[0], '{st} – {et} ଠାରେ {sm} {sd}, {sy}');
         test.equal(templatec00[1], '{st} – {et} ଠାରେ {sm} {sd}, {sy}');
         test.equal(templatec00[2], '{sm} {sd}, {sy}, {st} – {et}');
@@ -9879,9 +9877,9 @@ module.exports.testdaterangefmt = {
         test.equal(templatec12[2], '{sm} {sd}, {sy} – {em} {ed}, {ey}');
         test.equal(templatec12[3], '{sm}/{sd}/{sy} – {em}/{ed}/{ey}');
 
-        test.equal(templatec20[0], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[1], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
+        test.equal(templatec20[0], '{sm}, {sy} – {em}, {ey}');
+        test.equal(templatec20[1], '{sm}, {sy} – {em}, {ey}');
+        test.equal(templatec20[2], '{sm}, {sy} – {em}, {ey}');
         test.equal(templatec20[3], '{sm}/{sy} – {em}/{ey}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
@@ -11831,23 +11829,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
diff --git a/js/test/daterange/testdatefmtrange_fr_CA.js b/js/test/daterange/testdatefmtrange_fr_CA.js
index 6b8bee7a1f..5e2f44d768 100644
--- a/js/test/daterange/testdatefmtrange_fr_CA.js
+++ b/js/test/daterange/testdatefmtrange_fr_CA.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_fr_CA.js - test the date range formatter object in French/Canada
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-12-31 13 h 45 – 14 h 30");
+        test.equal(fmt.format(start, end), "2011-12-31 13 h 45 – 14 h 30");
         test.done();
     },
     testDateRngFmtCARangeInDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -115,7 +115,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -137,12 +137,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), '31 décembre 2011 à 13 h 45 – 14 h 30');
         test.done();
     },
-    
+
     testDateRngFmtCARangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-12-30 13 h 45 – 11-12-31 14 h 30");
+        test.equal(fmt.format(start, end), "2011-12-30 13 h 45 – 2011-12-31 14 h 30");
         test.done();
     },
     testDateRngFmtCARangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -220,7 +220,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -242,12 +242,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "30 décembre 2011 à 13 h 45 – 31 décembre 2011 à 14 h 30");
         test.done();
     },
-    
+
     testDateRngFmtCARangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -266,14 +266,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-12-20 – 31");
+        test.equal(fmt.format(start, end), "2011-12-20 – 31");
         test.done();
     },
     testDateRngFmtCARangeMultiDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "20 – 31 décembre 2011");
         test.done();
     },
-    
+
     testDateRngFmtCARangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -371,14 +371,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-11-20 – 11-12-31");
+        test.equal(fmt.format(start, end), "2011-11-20 – 2011-12-31");
         test.done();
     },
     testDateRngFmtCARangeNextMonthMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "20 novembre – 31 décembre 2011");
         test.done();
     },
-    
+
     testDateRngFmtCARangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -476,14 +476,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-11-20 – 12-01-31");
+        test.equal(fmt.format(start, end), "2011-11-20 – 2012-01-31");
         test.done();
     },
     testDateRngFmtCARangeNextYearMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "20 novembre 2011 – 31 janvier 2012");
         test.done();
     },
-    
+
     testDateRngFmtCARangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -581,14 +581,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-11 – 14-01");
+        test.equal(fmt.format(start, end), "2011-11 – 2014-01");
         test.done();
     },
     testDateRngFmtCARangeMultiYearMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_hi_IN.js b/js/test/daterange/testdatefmtrange_hi_IN.js
index ae27705038..1994ae0b76 100644
--- a/js/test/daterange/testdatefmtrange_hi_IN.js
+++ b/js/test/daterange/testdatefmtrange_hi_IN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_hi_IN.js - test the date range formatter object in Hindi/India
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/11, 1:45 अपराह्न – 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "31/12/11, 1:45 pm – 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeinDayMedium_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 दिस॰ 2011, 1:45 अपराह्न – 2:30 अपराह्न');
+        test.equal(fmt.format(start, end), '31 दिस॰ 2011, 1:45 pm – 2:30 pm');
         test.done();
     },
     testDateRngFmtRangeinDayLong_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 अपराह्न – 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 pm – 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeinDayFull_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 अपराह्न – 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 pm – 2:30 pm");
         test.done();
     },
-    
+
     testDateRngFmtRangeNextDayShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/11, 1:45 अपराह्न – 31/12/11, 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "30/12/11, 1:45 pm – 31/12/11, 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeNextDayMedium_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 दिस॰ 2011, 1:45 अपराह्न – 31 दिस॰ 2011, 2:30 अपराह्न');
+        test.equal(fmt.format(start, end), '30 दिस॰ 2011, 1:45 pm – 31 दिस॰ 2011, 2:30 pm');
         test.done();
     },
     testDateRngFmtRangeNextDayLong_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 अपराह्न – 31 दिसंबर 2011 को 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 pm – 31 दिसंबर 2011 को 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeNextDayFull_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,15 +239,15 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 अपराह्न – 31 दिसंबर 2011 को 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 pm – 31 दिसंबर 2011 को 2:30 pm");
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiDayShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "20 – 31 दिसंबर 2011");
         test.done();
     },
-    
+
     testDateRngFmtRangeNextMonthShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "20 नवंबर – 31 दिसंबर 2011");
         test.done();
     },
-    
+
     testDateRngFmtRangeNextYearShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "20 नवंबर 2011 – 31 जनवरी 2012");
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiYearShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js b/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js
index 4e35cd5be8..2acf37fc27 100644
--- a/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js
+++ b/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_mn-Cyrl_MN.js - test the date range formatter object in Mongolian/Mongolia for Cyrillic script.
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.31 13:45 – 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 31 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtMNRangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.31 13:45 – 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 31 13:45 – 14:30');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.30 13:45 – 2011.12.31 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 30 13:45 – 2011 оны арван хоёрдугаар сарын 31 14:30');
         test.done();
     },
     testDateRngFmtMNRangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,15 +239,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.30 13:45 – 2011.12.31 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 30 13:45 – 2011 оны арван хоёрдугаар сарын 31 14:30');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -318,14 +318,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.20 – 31');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 20 – 31');
         test.done();
     },
     testDateRngFmtMNRangeMultiDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -344,15 +344,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.20 – 31');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 20 – 31');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -423,14 +423,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 12.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – арван хоёрдугаар сарын 31');
         test.done();
     },
     testDateRngFmtMNRangeNextMonthFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -449,15 +449,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 12.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – арван хоёрдугаар сарын 31');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -528,14 +528,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 2012.01.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – 2012 оны нэгдүгээр сарын 31');
         test.done();
     },
     testDateRngFmtMNRangeNextYearFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -554,15 +554,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 2012.01.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – 2012 оны нэгдүгээр сарын 31');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -607,14 +607,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011 оны 11-р сарын – 2014 оны 1-р сарын');
+        test.equal(fmt.format(start, end), '2011 оны 11-р сар – 2014 оны 1-р сар');
         test.done();
     },
     testDateRngFmtMNRangeMultiYearLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -633,14 +633,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11 – 2014.01');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сар – 2014 оны нэгдүгээр сар');
         test.done();
     },
     testDateRngFmtMNRangeMultiYearFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -659,14 +659,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11 – 2014.01');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сар – 2014 оны нэгдүгээр сар');
         test.done();
     },
     testDateRngFmtMNManyYearsFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_or_IN.js b/js/test/daterange/testdatefmtrange_or_IN.js
index 2969e1e516..2806fb5d19 100644
--- a/js/test/daterange/testdatefmtrange_or_IN.js
+++ b/js/test/daterange/testdatefmtrange_or_IN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_or_IN.js - test the date range formatter object in Oriya/India
- * 
+ *
  * Copyright © 2015-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -115,7 +115,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -137,12 +137,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), '1:45 PM – 2:30 PM ଠାରେ ଡିସେମ୍ବର 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeNextDayShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -220,7 +220,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -242,12 +242,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), '1:45 PM ଠାରେ ଡିସେମ୍ବର 30, 2011 – 2:30 PM ଠାରେ ଡିସେମ୍ବର 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiDayShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), 'ଡିସେମ୍ବର 20 – 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeNextMonthShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), 'ନଭେମ୍ବର 20 – ଡିସେମ୍ବର 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeNextYearShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), 'ନଭେମ୍ବର 20, 2011 – ଜାନୁଆରୀ 31, 2012');
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiYearShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -607,14 +607,14 @@ module.exports.testdatefmtrange_or_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "ନଭେମ୍ବର 2011 – ଜାନୁଆରୀ 2014");
+        test.equal(fmt.format(start, end), "ନଭେମ୍ବର, 2011 – ଜାନୁଆରୀ, 2014");
         test.done();
     },
     testDateRngFmtRangeMultiYearLong_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -633,14 +633,14 @@ module.exports.testdatefmtrange_or_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "ନଭେମ୍ବର 2011 – ଜାନୁଆରୀ 2014");
+        test.equal(fmt.format(start, end), "ନଭେମ୍ବର, 2011 – ଜାନୁଆରୀ, 2014");
         test.done();
     },
     testDateRngFmtRangeMultiYearFull_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -659,14 +659,14 @@ module.exports.testdatefmtrange_or_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "ନଭେମ୍ବର 2011 – ଜାନୁଆରୀ 2014");
+        test.equal(fmt.format(start, end), "ନଭେମ୍ବର, 2011 – ଜାନୁଆରୀ, 2014");
         test.done();
     },
     testDateRngFmtManyYearsFull_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_pt_BR.js b/js/test/daterange/testdatefmtrange_pt_BR.js
index 73b1a67d35..447c82e519 100644
--- a/js/test/daterange/testdatefmtrange_pt_BR.js
+++ b/js/test/daterange/testdatefmtrange_pt_BR.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_pt_BR.js - test the date range formatter object in portuguese/Brazil
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de dez de 2011 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de dez. de 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtBRRangeInDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -115,7 +115,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -137,12 +137,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "31 de dezembro de 2011 13:45 – 14:30");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de dez de 2011 13:45 – 31 de dez de 2011 14:30");
+        test.equal(fmt.format(start, end), "30 de dez. de 2011 13:45 – 31 de dez. de 2011 14:30");
         test.done();
     },
     testDateRngFmtBRRangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -220,7 +220,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -242,12 +242,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "30 de dezembro de 2011 13:45 – 31 de dezembro de 2011 14:30");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -292,14 +292,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 – 31 de dez de 2011");
+        test.equal(fmt.format(start, end), "20 – 31 de dez. de 2011");
         test.done();
     },
     testDateRngFmtBRRangeMultiDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "20 – 31 de dezembro de 2011");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -397,14 +397,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de nov – 31 de dez de 2011");
+        test.equal(fmt.format(start, end), "20 de nov. – 31 de dez. de 2011");
         test.done();
     },
     testDateRngFmtBRRangeNextMonthLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "20 de novembro – 31 de dezembro de 2011");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -502,14 +502,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de nov de 2011 – 31 de jan de 2012");
+        test.equal(fmt.format(start, end), "20 de nov. de 2011 – 31 de jan. de 2012");
         test.done();
     },
     testDateRngFmtBRRangeNextYearLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "20 de novembro de 2011 – 31 de janeiro de 2012");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -607,14 +607,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "nov de 2011 – jan de 2014");
+        test.equal(fmt.format(start, end), "nov. de 2011 – jan. de 2014");
         test.done();
     },
     testDateRngFmtBRRangeMultiYearLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_sw_KE.js b/js/test/daterange/testdatefmtrange_sw_KE.js
index c42cf5e3f1..3131e5d4a5 100644
--- a/js/test/daterange/testdatefmtrange_sw_KE.js
+++ b/js/test/daterange/testdatefmtrange_sw_KE.js
@@ -56,7 +56,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31/12/2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeInDayMedium: function(test) {
@@ -82,7 +82,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 Des 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 Des 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeInDayLong: function(test) {
@@ -108,7 +108,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 Desemba 2011 saa 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 Desemba 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeInDayFull: function(test) {
@@ -134,7 +134,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 Desemba 2011 saa 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 Desemba 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayShort: function(test) {
@@ -160,7 +160,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/2011, 13:45 – 31/12/2011, 14:30");
+        test.equal(fmt.format(start, end), "30/12/2011 13:45 – 31/12/2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayMedium: function(test) {
@@ -186,7 +186,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 Des 2011, 13:45 – 31 Des 2011, 14:30");
+        test.equal(fmt.format(start, end), "30 Des 2011 13:45 – 31 Des 2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayLong: function(test) {
@@ -212,7 +212,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 Desemba 2011 saa 13:45 – 31 Desemba 2011 saa 14:30");
+        test.equal(fmt.format(start, end), "30 Desemba 2011 13:45 – 31 Desemba 2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayFull: function(test) {
@@ -238,7 +238,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 Desemba 2011 saa 13:45 – 31 Desemba 2011 saa 14:30");
+        test.equal(fmt.format(start, end), "30 Desemba 2011 13:45 – 31 Desemba 2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeMultiDayShort: function(test) {
diff --git a/js/test/durfmt/testSuiteFiles.js b/js/test/durfmt/testSuiteFiles.js
index 9e0e1f2510..058bc3573b 100644
--- a/js/test/durfmt/testSuiteFiles.js
+++ b/js/test/durfmt/testSuiteFiles.js
@@ -1,6 +1,6 @@
 /*
  * testSuiteFiles.js - list the test files in this directory
- * 
+ *
  * Copyright © 2017-2018, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/js/test/durfmt/testdurfmt.js b/js/test/durfmt/testdurfmt.js
index e9cac1fc29..c894c81b65 100644
--- a/js/test/durfmt/testdurfmt.js
+++ b/js/test/durfmt/testdurfmt.js
@@ -1,7 +1,7 @@
 /*
  * testdurfmt.js - test the duration formatter object
  *
- * Copyright © 2012-2015,2017, JEDLSoft
+ * Copyright © 2012-2020, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -443,7 +443,7 @@ module.exports.testdurfmt = {
             second: 1,
             millisecond: 1
         });
-        test.equal(duration.toString(), "1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 s, 1 ms");
+        test.equal(duration.toString(), "1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 Sek., 1 ms");
         test.done();
     },
 
@@ -466,7 +466,7 @@ module.exports.testdurfmt = {
             second: 1,
             millisecond: 1
         });
-        test.equal(duration.toString(), "1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 s, 1 ms");
+        test.equal(duration.toString(), "1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 Sek., 1 ms");
         test.done();
     },
 
@@ -511,7 +511,7 @@ module.exports.testdurfmt = {
             second: 1,
             millisecond: 1
         });
-        test.equal(duration.toString(), '1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 s, 1 ms');
+        test.equal(duration.toString(), '1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 Sek., 1 ms');
         test.done();
     },
 
@@ -777,7 +777,7 @@ module.exports.testdurfmt = {
             second: 1,
             millisecond: 1
         });
-        test.equal(duration.toString(), '1a 1m. 1sem. 1j 1h 1 min 1s 1ms');
+        test.equal(duration.toString(), '1a 1m. 1sem. 1j 1h 1min 1s 1ms');
         test.done();
     },
 
@@ -800,7 +800,7 @@ module.exports.testdurfmt = {
             second: 1,
             millisecond: 1
         });
-        test.equal(duration.toString(), '1a 1m. 1sem. 1j 1h 1 min 1s 1ms');
+        test.equal(duration.toString(), '1a 1m. 1sem. 1j 1h 1min 1s 1ms');
         test.done();
     },
 
@@ -845,7 +845,7 @@ module.exports.testdurfmt = {
             second: 1,
             millisecond: 1
         });
-        test.equal(duration.toString(), '1a, 1m., 1sem., 1j, 1h, 1 min, 1s, 1ms');
+        test.equal(duration.toString(), '1a, 1m., 1sem., 1j, 1h, 1min, 1s, 1ms');
         test.done();
     },
 
@@ -912,7 +912,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 г, 1 мес., 1 седм., 1 д, 1 ч, 1 мин, 1 с');
+        test.equal(duration.toString(), '1 г., 1 мес., 1 седм., 1 д, 1 ч, 1 мин, 1 с');
         test.done();
     },
 
@@ -934,7 +934,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 г, 1 мес., 1 седм., 1 д, 1 ч, 1 мин, 1 с');
+        test.equal(duration.toString(), '1 г., 1 мес., 1 седм., 1 д, 1 ч, 1 мин, 1 с');
         test.done();
     },
 
@@ -956,7 +956,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 г, 1 мес., 1 седм., 1 д, 1:01:01 ч.');
+        test.equal(duration.toString(), '1 г., 1 мес., 1 седм., 1 д, 1:01:01');
         test.done();
     },
 
@@ -977,7 +977,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 г, 1 мес., 1 седм., 1 д, 1 ч, 1 мин, 1 с');
+        test.equal(duration.toString(), '1 г., 1 мес., 1 седм., 1 д, 1 ч, 1 мин, 1 с');
         test.done();
     },
 
@@ -1390,7 +1390,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 år, 1 md., 1 uge, 1 dag, 1 t, 1 min., 1 sek.");
+        test.equal(duration.toString(), "1 år, 1 md., 1 uge, 1 dag, 1 t., 1 min., 1 sek.");
         test.done();
     },
 
@@ -2174,7 +2174,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 an, 1 m., 1 sem., 1 j, 1 h, 1 min, 1 s');
+        test.equal(duration.toString(), '1 an, 1 m., 1 sem., 1 j, 1 h, 1 min, 1 s');
         test.done();
     },
 
@@ -2195,7 +2195,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 an, 1 mois, 1 semaine, 1 jour, 1 heure, 1 minute et 1 seconde');
+        test.equal(duration.toString(), '1 an, 1 mois, 1 semaine, 1 jour, 1 heure, 1 minute et 1 seconde');
         test.done();
     },
 
@@ -3041,7 +3041,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾರ, 1ದಿನ, 1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ");
+        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾ, 1ದಿ, 1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ");
         test.done();
     },
 
@@ -3063,7 +3063,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾರ, 1ದಿನ, 1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ");
+        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾ, 1ದಿ, 1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ");
         test.done();
     },
 
@@ -3085,7 +3085,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾರ, 1ದಿನ, 1:01:01");
+        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾ, 1ದಿ, 1:01:01");
         test.done();
     },
 
@@ -3106,7 +3106,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾರ, 1ದಿನ, 1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ");
+        test.equal(duration.toString(), "1ವ, 1ತಿಂ., 1ವಾ, 1ದಿ, 1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ");
         test.done();
     },
 
@@ -3278,7 +3278,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ஆண்டு, 1 மாதம், 1 வாரம், 1 நாள், 1 மணிநேரம், 1 நிமிடம், 1 விநாடி");
+        test.equal(duration.toString(), "1 ஆண்டு, 1 மாதம், 1 வாரம், 1 நாள், 1 மணிநேரம், 1 நிமிடம் மற்றும் 1 விநாடி");
         test.done();
     },
 
@@ -3892,7 +3892,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ, 1 ਘੰਟਾ, 1 ਮਿੰਟ, 1 ਸਕਿੰਟ");
+        test.equal(duration.toString(), "1 ਸਾਲ 1 ਮਹੀਨਾ 1 ਹਫ਼ਤਾ 1 ਦਿਨ 1 ਘੰਟਾ 1 ਮਿੰਟ 1 ਸਕਿੰਟ");
         test.done();
     },
 
@@ -3914,7 +3914,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ, 1 ਘੰਟਾ, 1 ਮਿੰਟ, 1 ਸਕਿੰਟ");
+        test.equal(duration.toString(), "1 ਸਾਲ 1 ਮਹੀਨਾ 1 ਹਫ਼ਤਾ 1 ਦਿਨ 1 ਘੰਟਾ 1 ਮਿੰਟ 1 ਸਕਿੰਟ");
         test.done();
     },
 
@@ -3936,7 +3936,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ, 1:01:01");
+        test.equal(duration.toString(), "1 ਸਾਲ 1 ਮਹੀਨਾ 1 ਹਫ਼ਤਾ 1 ਦਿਨ 1:01:01");
         test.done();
     },
 
@@ -3957,7 +3957,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ, 1 ਘੰਟਾ, 1 ਮਿੰਟ, 1 ਸਕਿੰਟ");
+        test.equal(duration.toString(), "1 ਸਾਲ 1 ਮਹੀਨਾ 1 ਹਫ਼ਤਾ 1 ਦਿਨ 1 ਘੰਟਾ 1 ਮਿੰਟ 1 ਸਕਿੰਟ");
         test.done();
     },
 
@@ -5337,7 +5337,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 g. 1 m. 1 n. 1d 1h 1 min 1s');
+        test.equal(duration.toString(), '1 g. 1 m. 1 n. 1 d. 1 h 1 min 1 s');
         test.done();
     },
 
@@ -5359,7 +5359,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 g. 1 m. 1 n. 1d 1h 1 min 1s');
+        test.equal(duration.toString(), '1 g. 1 m. 1 n. 1 d. 1 h 1 min 1 s');
         test.done();
     },
 
@@ -5381,7 +5381,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 g. 1 m. 1 n. 1d 01:01:01');
+        test.equal(duration.toString(), '1 g. 1 m. 1 n. 1 d. 01:01:01');
         test.done();
     },
 
@@ -5402,7 +5402,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 g., 1 m., 1 n., 1d, 1h, 1 min, 1s');
+        test.equal(duration.toString(), '1 g., 1 m., 1 n., 1 d., 1 h, 1 min, 1 s');
         test.done();
     },
 
@@ -5598,7 +5598,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 жил, 1 сар, 1 д/х, 1 өдөр, 1 ц, 1 мин, 1 сек");
+        test.equal(duration.toString(), "1ж 1с 1 д.х 1 хоног 1 ц 1 мин 1 сек");
         test.done();
     },
 
@@ -5620,7 +5620,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 жил, 1 сар, 1 д/х, 1 өдөр, 1 ц, 1 мин, 1 сек");
+        test.equal(duration.toString(), "1ж 1с 1 д.х 1 хоног 1 ц 1 мин 1 сек");
         test.done();
     },
 
@@ -5642,7 +5642,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 жил, 1 сар, 1 д/х, 1 өдөр, 01:01:01");
+        test.equal(duration.toString(), "1ж 1с 1 д.х 1 хоног 01:01:01");
         test.done();
     },
 
@@ -5663,7 +5663,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 жил, 1 сар, 1 д/х, 1 өдөр, 1 ц, 1 мин, 1 сек');
+        test.equal(duration.toString(), '1ж 1с 1 д.х 1 хоног 1 ц 1 мин 1 сек');
         test.done();
     },
 
@@ -5684,7 +5684,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 жил, 1 сар, 1 дол/хон, 1 өдөр, 1 цаг, 1 мин, 1 сек");
+        test.equal(duration.toString(), "1 жил 1 сар 1 д.х 1 хоног 1 цаг 1 мин 1 сек");
         test.done();
     },
 
@@ -5705,7 +5705,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 жил, 1 сар, 1 долоо хоног, 1 өдөр, 1 цаг, 1 минут, 1 секунд");
+        test.equal(duration.toString(), "1 жил 1 сар 1 долоо хоног 1 хоног 1 цаг 1 минут 1 секунд");
         test.done();
     },
 
@@ -6253,7 +6253,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ano, 1 mês, 1 sem., 1 dia, 1 h, 1 min, 1 s");
+        test.equal(duration.toString(), "1 ano 1 mês 1 sem. 1 dia 1 h 1 min 1 s");
         test.done();
     },
 
@@ -6275,7 +6275,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ano, 1 mês, 1 sem., 1 dia, 1 h, 1 min, 1 s");
+        test.equal(duration.toString(), "1 ano 1 mês 1 sem. 1 dia 1 h 1 min 1 s");
         test.done();
     },
 
@@ -6297,7 +6297,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 ano, 1 mês, 1 sem., 1 dia, 01:01:01");
+        test.equal(duration.toString(), "1 ano 1 mês 1 sem. 1 dia 01:01:01");
         test.done();
     },
 
@@ -6318,7 +6318,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 ano, 1 mês, 1 sem., 1 dia, 1 h, 1 min, 1 s');
+        test.equal(duration.toString(), "1 ano, 1 mês, 1 sem., 1 dia, 1 h, 1 min, 1 s");
         test.done();
     },
 
@@ -6599,7 +6599,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), '1 г. 1 мес. 1 нед. 1 дн. 1 ч. 1 мин. 1 сек.');
+        test.equal(duration.toString(), '1 г. 1 мес. 1 нед. 1 дн. 1 ч 1 мин. 1 сек.');
         test.done();
     },
 
@@ -7642,7 +7642,7 @@ module.exports.testdurfmt = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "1 năm, 1 tháng, 1 tuần, 1 ngày, 1 giờ, 1 phút, 1 giây");
+        test.equal(duration.toString(), "1 năm, 1 tháng, 1 tuần, 1 ngày, 1 giờ, 1 phút và 1 giây");
         test.done();
     },
 
diff --git a/js/test/durfmt/testdurfmt2.js b/js/test/durfmt/testdurfmt2.js
index 737cc2b5f9..5d8c54d100 100644
--- a/js/test/durfmt/testdurfmt2.js
+++ b/js/test/durfmt/testdurfmt2.js
@@ -65,53 +65,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -143,53 +143,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -221,53 +221,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -296,7 +296,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 বছৰ, 1 মাহ, 1 সপ্তাহ, 1 দিন');
         test.equal(textformatted_1[2], '1 বছৰ 1 মাহ 1 সপ্তাহ 1 দিন');
         test.equal(textformatted_1[3], '1 বছৰ 1 মাহ 1 সপ্তাহ 1 দিন');
-    
+
         test.equal(textformatted_2[0], '2 বছৰ, 2 মাহ, 2 সপ্তাহ, 2 দিন');
         test.equal(textformatted_2[1], '2 বছৰ, 2 মাহ, 2 সপ্তাহ, 2 দিন');
         test.equal(textformatted_2[2], '2 বছৰ 2 মাহ 2 সপ্তাহ 2 দিন');
@@ -306,7 +306,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ঘণ্টা, 1 মিনিট, 1 ছেকেণ্ড');
         test.equal(clockformatted_1[2], '1 ঘণ্টা 1 মিনিট 1 ছেকেণ্ড');
         test.equal(clockformatted_1[3], '1 ঘণ্টা 1 মিনিট 1 ছেকেণ্ড');
-    
+
         test.equal(clockformatted_2[0], '2 ঘণ্টা, 2 মিনিট, 2 ছেকেণ্ড');
         test.equal(clockformatted_2[1], '2 ঘণ্টা, 2 মিনিট, 2 ছেকেণ্ড');
         test.equal(clockformatted_2[2], '2 ঘণ্টা 2 মিনিট 2 ছেকেণ্ড');
@@ -336,19 +336,19 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 година, 1 месец, 1 седмица и 1 ден');
         test.equal(textformatted_1[1], '1 год., 1 мес., 1 седм., 1 д');
-        test.equal(textformatted_1[2], '1 г, 1 мес., 1 седм., 1 д');
-        test.equal(textformatted_1[3], '1 г, 1 мес., 1 седм., 1 д');
-    
+        test.equal(textformatted_1[2], '1 г., 1 мес., 1 седм., 1 д');
+        test.equal(textformatted_1[3], '1 г., 1 мес., 1 седм., 1 д');
+
         test.equal(textformatted_2[0], '2 години, 2 месеца, 2 седмици и 2 дни');
         test.equal(textformatted_2[1], '2 год., 2 мес., 2 седм., 2 д');
-        test.equal(textformatted_2[2], '2 г, 2 мес., 2 седм., 2 д'); // CLDR 34 change (year, month)
-        test.equal(textformatted_2[3], '2 г, 2 мес., 2 седм., 2 д'); // CLDR 34 change (year, month)
+        test.equal(textformatted_2[2], '2 г., 2 мес., 2 седм., 2 д'); // CLDR 34 change (year, month)
+        test.equal(textformatted_2[3], '2 г., 2 мес., 2 седм., 2 д'); // CLDR 34 change (year, month)
 
         test.equal(clockformatted_1[0], '1 час, 1 минута и 1 секунда');
         test.equal(clockformatted_1[1], '1 ч, 1 мин, 1 сек');
         test.equal(clockformatted_1[2], '1 ч, 1 мин, 1 с');
         test.equal(clockformatted_1[3], '1 ч, 1 мин, 1 с');
-    
+
         test.equal(clockformatted_2[0], '2 часа, 2 минути и 2 секунди');
         test.equal(clockformatted_2[1], '2 ч, 2 мин, 2 сек');
         test.equal(clockformatted_2[2], '2 ч, 2 мин, 2 с'); // CLDR 34 change
@@ -380,7 +380,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 বছর, 1 মাস, 1 সপ্তাহ, 1 দিন');
         test.equal(textformatted_1[2], '1 বছর, 1 মাস, 1 সপ্তাহ, 1 দিন');
         test.equal(textformatted_1[3], '1 বছর, 1 মাস, 1 সপ্তাহ, 1 দিন');
-    
+
         test.equal(textformatted_18[0], '18 বছর, 18 মাস, 18 সপ্তাহ, 18 দিন');
         test.equal(textformatted_18[1], '18 বছর, 18 মাস, 18 সপ্তাহ, 18 দিন');
         test.equal(textformatted_18[2], '18 বছর, 18 মাস, 18 সপ্তাহ, 18 দিন');
@@ -390,7 +390,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ঘন্টা, 1 মিনিট, 1 সেকেন্ড');
         test.equal(clockformatted_1[2], '1 ঘঃ, 1 মিঃ, 1 সেঃ');
         test.equal(clockformatted_1[3], '1 ঘঃ, 1 মিঃ, 1 সেঃ');
-    
+
         test.equal(clockformatted_18[0], '18 ঘন্টা, 18 মিনিট, 18 সেকেন্ড');
         test.equal(clockformatted_18[1], '18 ঘন্টা, 18 মিনিট, 18 সেকেন্ড');
         test.equal(clockformatted_18[2], '18 ঘঃ, 18 মিঃ, 18 সেঃ');
@@ -425,7 +425,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 god., 1 mj., 1 sedm., 1 dan');
         test.equal(textformatted_1[2], '1 god., 1 mj., 1 sedm., 1 d.');
         test.equal(textformatted_1[3], '1 god., 1 mj., 1 sedm., 1 d.');
-    
+
         test.equal(textformatted_4[0], '4 godine, 4 mjeseca, 4 sedmice i 4 dana');
         test.equal(textformatted_4[1], '4 god., 4 mj., 4 sedm., 4 dana');
         test.equal(textformatted_4[2], '4 god., 4 mj., 4 sedm., 4 d.');
@@ -440,7 +440,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min., 1 sek.');
         test.equal(clockformatted_1[2], '1 h, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 h, 1 m, 1 s');
-    
+
         test.equal(clockformatted_4[0], '4 sata, 4 minute i 4 sekunde');
         test.equal(clockformatted_4[1], '4 h, 4 min., 4 sek.');
         test.equal(clockformatted_4[2], '4 h, 4 m, 4 s');
@@ -479,7 +479,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 god., 1 mj., 1 sedm., 1 dan');
         test.equal(textformatted_1[2], '1 god., 1 mj., 1 sedm., 1 d.');
         test.equal(textformatted_1[3], '1 god., 1 mj., 1 sedm., 1 d.');
-    
+
         test.equal(textformatted_2[0], '2 godine, 2 mjeseca, 2 sedmice i 2 dana');
         test.equal(textformatted_2[1], '2 god., 2 mj., 2 sedm., 2 dana');
         test.equal(textformatted_2[2], '2 god., 2 mj., 2 sedm., 2 d.');
@@ -494,7 +494,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min., 1 sek.');
         test.equal(clockformatted_1[2], '1 h, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 h, 1 m, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 sata, 2 minute i 2 sekunde');
         test.equal(clockformatted_2[1], '2 h, 2 min., 2 sek.');
         test.equal(clockformatted_2[2], '2 h, 2 m, 2 s');
@@ -533,7 +533,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 rok, 1 měs., 1 týd., 1 den');
         test.equal(textformatted_1[2], '1 r, 1 m, 1 t, 1 d');
         test.equal(textformatted_1[3], '1 r 1 m 1 t 1 d');
-    
+
         test.equal(textformatted_2[0], '2 roky, 2 měsíce, 2 týdny a 2 dny');
         test.equal(textformatted_2[1], '2 roky, 2 měs., 2 týd., 2 dny');
         test.equal(textformatted_2[2], '2 r, 2 m, 2 t, 2 d');
@@ -548,7 +548,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 h 1 m 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 hodiny, 2 minuty a 2 sekundy');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
         test.equal(clockformatted_2[2], '2 h, 2 m, 2 s');
@@ -585,21 +585,21 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 år, 1 md., 1 uge, 1 dag');
         test.equal(textformatted_1[2], '1 år, 1 m, 1 u, 1 d');
         test.equal(textformatted_1[3], '1 år, 1 m, 1 u, 1 d');
-    
+
         test.equal(textformatted_2[0], '2 år, 2 måneder, 2 uger og 2 dage');
         test.equal(textformatted_2[1], '2 år, 2 mdr., 2 uger, 2 dage');
         test.equal(textformatted_2[2], '2 år, 2 m, 2 u, 2 d');
         test.equal(textformatted_2[3], '2 år, 2 m, 2 u, 2 d');
 
         test.equal(clockformatted_1[0], '1 time, 1 minut og 1 sekund');
-        test.equal(clockformatted_1[1], '1 t, 1 min., 1 sek.');
+        test.equal(clockformatted_1[1], '1 t., 1 min., 1 sek.');
         test.equal(clockformatted_1[2], '1 t, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 t, 1 m, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 timer, 2 minutter og 2 sekunder');
         test.equal(clockformatted_2[1], '2 t, 2 min., 2 sek.');
-        test.equal(clockformatted_2[2], '2 t, 2 min, 2 s');
-        test.equal(clockformatted_2[3], '2 t, 2 min, 2 s');
+        test.equal(clockformatted_2[2], '2 t, 2 m, 2 s');
+        test.equal(clockformatted_2[3], '2 t, 2 m, 2 s');
 
         test.done();
     },
@@ -635,13 +635,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 Stunde, 1 Minute und 1 Sekunde');
         test.equal(clockformatted_1[1], '1 Std., 1 Min., 1 Sek.');
-        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 s');
-        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 s');
+        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 Sek.');
+        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 Sek.');
 
         test.equal(clockformatted_2[0], '2 Stunden, 2 Minuten und 2 Sekunden');
         test.equal(clockformatted_2[1], '2 Std., 2 Min., 2 Sek.');
-        test.equal(clockformatted_2[2], '2 Std., 2 Min., 2 s');
-        test.equal(clockformatted_2[3], '2 Std., 2 Min., 2 s');
+        test.equal(clockformatted_2[2], '2 Std., 2 Min., 2 Sek.');
+        test.equal(clockformatted_2[3], '2 Std., 2 Min., 2 Sek.');
 
         test.done();
     },
@@ -676,13 +676,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 Stunde, 1 Minute und 1 Sekunde');
         test.equal(clockformatted_1[1], '1 Std., 1 Min., 1 Sek.');
-        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 s');
-        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 s');
+        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 Sek.');
+        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 Sek.');
 
         test.equal(clockformatted_2[0], '2 Stunden, 2 Minuten und 2 Sekunden');
         test.equal(clockformatted_2[1], '2 Std., 2 Min., 2 Sek.');
-        test.equal(clockformatted_2[2], '2 Std., 2 Min., 2 s');
-        test.equal(clockformatted_2[3], '2 Std., 2 Min., 2 s');
+        test.equal(clockformatted_2[2], '2 Std., 2 Min., 2 Sek.');
+        test.equal(clockformatted_2[3], '2 Std., 2 Min., 2 Sek.');
 
         test.done();
     },
@@ -717,13 +717,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 Stunde, 1 Minute und 1 Sekunde');
         test.equal(clockformatted_1[1], '1 Std., 1 Min., 1 Sek.');
-        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 s');
-        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 s');
+        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 Sek.');
+        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 Sek.');
 
         test.equal(clockformatted_16[0], '16 Stunden, 16 Minuten und 16 Sekunden');
         test.equal(clockformatted_16[1], '16 Std., 16 Min., 16 Sek.');
-        test.equal(clockformatted_16[2], '16 Std., 16 Min., 16 s');
-        test.equal(clockformatted_16[3], '16 Std., 16 Min., 16 s');
+        test.equal(clockformatted_16[2], '16 Std., 16 Min., 16 Sek.');
+        test.equal(clockformatted_16[3], '16 Std., 16 Min., 16 Sek.');
 
         test.done();
     },
@@ -758,13 +758,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 Stunde, 1 Minute und 1 Sekunde');
         test.equal(clockformatted_1[1], '1 Std., 1 Min., 1 Sek.');
-        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 s');
-        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 s');
+        test.equal(clockformatted_1[2], '1 Std., 1 Min., 1 Sek.');
+        test.equal(clockformatted_1[3], '1 Std., 1 Min., 1 Sek.');
 
         test.equal(clockformatted_17[0], '17 Stunden, 17 Minuten und 17 Sekunden');
         test.equal(clockformatted_17[1], '17 Std., 17 Min., 17 Sek.');
-        test.equal(clockformatted_17[2], '17 Std., 17 Min., 17 s');
-        test.equal(clockformatted_17[3], '17 Std., 17 Min., 17 s');
+        test.equal(clockformatted_17[2], '17 Std., 17 Min., 17 Sek.');
+        test.equal(clockformatted_17[3], '17 Std., 17 Min., 17 Sek.');
 
         test.done();
     },
@@ -792,7 +792,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 έτ., 1 μήν., 1 εβδ., 1 ημέρα');
         test.equal(textformatted_1[2], '1 έ, 1 μ, 1 ε, 1 η');
         test.equal(textformatted_1[3], '1 έ 1 μ 1 ε 1 η');
-    
+
         test.equal(textformatted_2[0], '2 έτη, 2 μήνες, 2 εβδομάδες, 2 ημέρες');
         test.equal(textformatted_2[1], '2 έτ., 2 μήν., 2 εβδ., 2 ημέρες');
         test.equal(textformatted_2[2], '2 έ, 2 μ, 2 ε, 2 η');
@@ -802,7 +802,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ώρα, 1 λεπ., 1 δευτ.');
         test.equal(clockformatted_1[2], '1 ώ, 1 λ, 1 δ');
         test.equal(clockformatted_1[3], '1 ώ 1 λ 1 δ');
-    
+
         test.equal(clockformatted_2[0], '2 ώρες, 2 λεπτά, 2 δευτερόλεπτα');
         test.equal(clockformatted_2[1], '2 ώρ., 2 λεπ., 2 δευτ.');
         test.equal(clockformatted_2[2], '2 ώ, 2 λ, 2 δ');
@@ -834,7 +834,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 έτ., 1 μήν., 1 εβδ., 1 ημέρα');
         test.equal(textformatted_1[2], '1 έ, 1 μ, 1 ε, 1 η');
         test.equal(textformatted_1[3], '1 έ 1 μ 1 ε 1 η');
-    
+
         test.equal(textformatted_17[0], '17 έτη, 17 μήνες, 17 εβδομάδες, 17 ημέρες');
         test.equal(textformatted_17[1], '17 έτ., 17 μήν., 17 εβδ., 17 ημέρες');
         test.equal(textformatted_17[2], '17 έ, 17 μ, 17 ε, 17 η');
@@ -844,7 +844,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ώρα, 1 λεπ., 1 δευτ.');
         test.equal(clockformatted_1[2], '1 ώ, 1 λ, 1 δ');
         test.equal(clockformatted_1[3], '1 ώ 1 λ 1 δ');
-    
+
         test.equal(clockformatted_17[0], '17 ώρες, 17 λεπτά, 17 δευτερόλεπτα');
         test.equal(clockformatted_17[1], '17 ώρ., 17 λεπ., 17 δευτ.');
         test.equal(clockformatted_17[2], '17 ώ, 17 λ, 17 δ');
@@ -917,7 +917,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 m., 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_16[0], '16 years, 16 months, 16 weeks, 16 days');
         test.equal(textformatted_16[1], '16 yrs, 16 m., 16 wks, 16 days');
         test.equal(textformatted_16[2], '16y, 16m, 16w, 16d');
@@ -925,14 +925,14 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hour, 1 minute, 1 second');
         test.equal(clockformatted_1[1], '1 hr, 1 min., 1 sec.');
-        test.equal(clockformatted_1[2], '1h, 1 min., 1 s.');
-        test.equal(clockformatted_1[3], '1h 1 min. 1 s.');
-    
+        test.equal(clockformatted_1[2], '1h, 1min., 1s.');
+        test.equal(clockformatted_1[3], '1h 1min. 1s.');
+
         test.equal(clockformatted_16[0], '16 hours, 16 minutes, 16 seconds');
         test.equal(clockformatted_16[1], '16 hrs, 16 min., 16 sec.');
-        test.equal(clockformatted_16[3], '16h 16 min. 16 s.');
-        test.equal(clockformatted_16[3], '16h 16 min. 16 s.');
-        
+        test.equal(clockformatted_16[3], '16h 16min. 16s.');
+        test.equal(clockformatted_16[3], '16h 16min. 16s.');
+
         test.done();
     },
     testDurFmt_en_AZ: function(test) {
@@ -958,7 +958,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_17[0], '17 years, 17 months, 17 weeks, 17 days');
         test.equal(textformatted_17[1], '17 yrs, 17 mths, 17 wks, 17 days');
         test.equal(textformatted_17[2], '17y, 17m, 17w, 17d');
@@ -968,7 +968,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_17[0], '17 hours, 17 minutes, 17 seconds');
         test.equal(clockformatted_17[1], '17 hr, 17 min, 17 sec');
         test.equal(clockformatted_17[2], '17h, 17m, 17s');
@@ -1000,7 +1000,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr., 1 mo., 1 wk., 1 day');
         test.equal(textformatted_1[2], '1 y, 1 m, 1 w, 1 d');
         test.equal(textformatted_1[3], '1 y 1 m 1 w 1 d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs., 2 mos., 2 wks., 2 days'); // CLDR 34 change (month)
         test.equal(textformatted_2[2], '2 y, 2 m, 2 w, 2 d');
@@ -1010,7 +1010,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr., 1 min., 1 sec.');
         test.equal(clockformatted_1[2], '1 h, 1 min., 1 sec.');
         test.equal(clockformatted_1[3], '1 h 1 min. 1 sec.');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs., 2 min., 2 secs.');
         test.equal(clockformatted_2[2], '2 h, 2 min., 2 sec.');
@@ -1042,7 +1042,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1052,7 +1052,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1084,7 +1084,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1094,7 +1094,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1125,7 +1125,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1135,7 +1135,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1166,7 +1166,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1176,7 +1176,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1208,7 +1208,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1218,7 +1218,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1248,7 +1248,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1258,7 +1258,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1288,7 +1288,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1298,7 +1298,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1328,7 +1328,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1338,7 +1338,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1368,7 +1368,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1378,7 +1378,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1409,7 +1409,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1419,7 +1419,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1449,7 +1449,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1459,7 +1459,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1489,7 +1489,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1499,7 +1499,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1529,7 +1529,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1539,7 +1539,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1569,7 +1569,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1579,7 +1579,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1609,7 +1609,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1619,7 +1619,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1649,7 +1649,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1659,7 +1659,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1689,7 +1689,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1699,7 +1699,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1730,7 +1730,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1740,7 +1740,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1771,7 +1771,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1781,7 +1781,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1791,7 +1791,7 @@ module.exports.testdurfmt2 = {
     },
     testDurFmt_en_UG: function(test) {
         test.expect(16);
-        // 1 2 
+        // 1 2
         var textfmt;
         var data = setVariable();
         var length = data["fullLength"];
@@ -1811,7 +1811,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1821,7 +1821,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1851,7 +1851,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1861,7 +1861,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1891,7 +1891,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -1901,7 +1901,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -1928,10 +1928,10 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '1 año, 1 mes, 1 semana y 1 día');
-        test.equal(textformatted_1[1], '1 año, 1 m., 1 sem., 1 d.' ); 
+        test.equal(textformatted_1[1], '1 año, 1 m., 1 sem., 1 d.' );
          test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_2[0], '2 años, 2 meses, 2 semanas y 2 días');
         test.equal(textformatted_2[1], '2 años, 2 mm., 2 sems., 2 dd.');
         test.equal(textformatted_2[2], '2a., 2mm., 2sems., 2dd.');
@@ -1941,7 +1941,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 seg.');
         test.equal(clockformatted_1[2], '1h, 1min, 1seg.');
         test.equal(clockformatted_1[3], '1h 1min 1seg.');
-    
+
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 seg.');
         test.equal(clockformatted_2[2], '2h, 2min, 2seg.');
@@ -1972,7 +1972,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_16[0], '2 años, 2 meses, 2 semanas y 2 días');
         test.equal(textformatted_16[1], '2 aa., 2 mm., 2 sems., 2 dd.');
         test.equal(textformatted_16[2], '2aa., 2mm., 2sems., 2dd.');
@@ -1980,13 +1980,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_16[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_16[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_16[2], '2h, 2min, 2s');
-        test.equal(clockformatted_16[3], '2h 2min 2s');
+        test.equal(clockformatted_16[2], '2h, 2min, 2 s');
+        test.equal(clockformatted_16[3], '2h 2min 2 s');
 
         test.done();
     },
@@ -2012,7 +2012,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_2[0], '2 años, 2 meses, 2 semanas y 2 días');
         test.equal(textformatted_2[1], '2 aa., 2 mm., 2 sems., 2 dd.');
         test.equal(textformatted_2[2], '2aa., 2mm., 2sems., 2dd.');
@@ -2020,13 +2020,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2 s');
+        test.equal(clockformatted_2[3], '2h 2min 2 s');
 
         test.done();
     },
@@ -2058,17 +2058,17 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_16[1], '16 a., 16 meses, 16 sems., 16 días');
         test.equal(textformatted_16[2], '16 a., 16 meses, 16 sems., 16 días');
         test.equal(textformatted_16[3], '16 a. 16 meses 16 sems. 16 días');
-                                         
+
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 h 1 min 1 s');
-    
+
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
         test.equal(clockformatted_16[2], '16 h, 16 min, 16 s');
         test.equal(clockformatted_16[3], '16 h 16 min 16 s');
-                                         
+
         test.done();
     },
     testDurFmt_es_DO: function(test) {
@@ -2093,7 +2093,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_2[0], '2 años, 2 meses, 2 semanas y 2 días');
         test.equal(textformatted_2[1], '2 aa., 2 mm., 2 sems., 2 dd.');
         test.equal(textformatted_2[2], '2aa., 2m., 2sems., 2d.');
@@ -2101,13 +2101,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 seg.');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 seg.');
+        test.equal(clockformatted_1[3], '1h 1min 1 seg.');
+
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 seg.');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2 seg.');
+        test.equal(clockformatted_2[3], '2h 2min 2 seg.');
 
         test.done();
     },
@@ -2134,7 +2134,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_16[0], '16 años, 16 meses, 16 semanas y 16 días');
         test.equal(textformatted_16[1], '16 aa., 16 mm., 16 sems., 16 dd.');
         test.equal(textformatted_16[2], '16aa., 16mm., 16sems., 16dd.');
@@ -2142,13 +2142,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16min, 16s');
-        test.equal(clockformatted_16[3], '16h 16min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16 s');
+        test.equal(clockformatted_16[3], '16h 16min 16 s');
 
         test.done();
     },
@@ -2172,23 +2172,23 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 año, 1 mes, 1 semana y 1 día');
         test.equal(textformatted_1[1], '1 a, 1 m., 1 sem., 1 d');
-        test.equal(textformatted_1[2], '1a, 1m, 1sem, 1d');
-        test.equal(textformatted_1[3], '1a 1m 1sem 1d');
-    
+        test.equal(textformatted_1[2], '1 a, 1 m., 1 sem., 1 d');
+        test.equal(textformatted_1[3], '1 a 1 m. 1 sem. 1 d');
+
         test.equal(textformatted_2[0], '2 años, 2 meses, 2 semanas y 2 días');
         test.equal(textformatted_2[1], '2 a, 2 m., 2 sem., 2 d');
-        test.equal(textformatted_2[2], '2a, 2m, 2sem, 2d');
-        test.equal(textformatted_2[3], '2a 2m 2sem 2d');
+        test.equal(textformatted_2[2], '2 a, 2 m., 2 sem., 2 d');
+        test.equal(textformatted_2[3], '2 a 2 m. 2 sem. 2 d');
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
+        test.equal(clockformatted_1[3], '1 h 1 min 1 s');
+
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2 h, 2 min, 2 s');
+        test.equal(clockformatted_2[3], '2 h 2 min 2 s');
 
         test.done();
     },
@@ -2215,7 +2215,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_16[0], '16 años, 16 meses, 16 semanas y 16 días');
         test.equal(textformatted_16[1], '16 aa., 16 mm., 16 sems., 16 dd.');
         test.equal(textformatted_16[2], '16aa., 16mm., 16sems., 16dd.');
@@ -2223,13 +2223,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16min, 16s');
-        test.equal(clockformatted_16[3], '16h 16min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16 s');
+        test.equal(clockformatted_16[3], '16h 16min 16 s');
 
         test.done();
     },
@@ -2256,7 +2256,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_17[0], '17 años, 17 meses, 17 semanas y 17 días');
         test.equal(textformatted_17[1], '17 aa., 17 mm., 17 sems., 17 dd.');
         test.equal(textformatted_17[2], '17aa., 17mm., 17sems., 17dd.');
@@ -2264,13 +2264,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17min, 17s');
-        test.equal(clockformatted_17[3], '17h 17min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17 s');
+        test.equal(clockformatted_17[3], '17h 17min 17 s');
 
         test.done();
     },
@@ -2296,7 +2296,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a, 1 m, 1 sem, 1 día');
         test.equal(textformatted_1[2], '1a, 1m, 1sem, 1d');
         test.equal(textformatted_1[3], '1a 1m 1sem 1d');
-    
+
         test.equal(textformatted_2[0], '2 años, 2 meses, 2 semanas y 2 días');
         test.equal(textformatted_2[1], '2 a, 2 m, 2 sem, 2 días');
         test.equal(textformatted_2[2], '2a, 2m, 2sem, 2d');
@@ -2304,13 +2304,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2 s');
+        test.equal(clockformatted_2[3], '2h 2min 2 s');
 
         test.done();
     },
@@ -2345,13 +2345,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
 
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16min, 16s');
-        test.equal(clockformatted_16[3], '16h 16min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16 s');
+        test.equal(clockformatted_16[3], '16h 16min 16 s');
 
         test.done();
     },
@@ -2386,13 +2386,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17min, 17s');
-        test.equal(clockformatted_17[3], '17h 17min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17 s');
+        test.equal(clockformatted_17[3], '17h 17min 17 s');
 
         test.done();
     },
@@ -2427,13 +2427,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
 
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16min, 16s');
-        test.equal(clockformatted_16[3], '16h 16min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16 s');
+        test.equal(clockformatted_16[3], '16h 16min 16 s');
 
         test.done();
     },
@@ -2467,13 +2467,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2 s');
+        test.equal(clockformatted_2[3], '2h 2min 2 s');
 
         test.done();
     },
@@ -2507,13 +2507,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 seg.');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 seg.');
+        test.equal(clockformatted_1[3], '1h 1min 1 seg.');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 seg.');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2 seg.');
+        test.equal(clockformatted_2[3], '2h 2min 2 seg.');
 
         test.done();
     },
@@ -2548,13 +2548,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17min, 17s');
-        test.equal(clockformatted_17[3], '17h 17min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17 s');
+        test.equal(clockformatted_17[3], '17h 17min 17 s');
 
         test.done();
     },
@@ -2567,7 +2567,7 @@ module.exports.testdurfmt2 = {
 
         var textformatted_1 = [],textformatted_17 = [];
         var clockformatted_1 = [],clockformatted_17 = [];
-        
+
         for (var i=0; i<4; i++) {
             textfmt = new DurationFmt({locale: "es-US", style:"text", length:length[i]});
             textformatted_1.push(textfmt.format({year: 1,month: 1,week: 1,day: 1}).toString());
@@ -2578,24 +2578,24 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '1 año, 1 mes, 1 semana y 1 día');
-        test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
-        test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
-        test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
+        test.equal(textformatted_1[1], '1 a, 1 m, 1 sem, 1 día');
+        test.equal(textformatted_1[2], '1a, 1m, 1sem, 1d');
+        test.equal(textformatted_1[3], '1a 1m 1sem 1d');
 
         test.equal(textformatted_17[0], '17 años, 17 meses, 17 semanas y 17 días');
-        test.equal(textformatted_17[1], '17 aa., 17 mm., 17 sems., 17 dd.');
-        test.equal(textformatted_17[2], '17aa., 17mm., 17sems., 17dd.');
-        test.equal(textformatted_17[3], '17aa. 17mm. 17sems. 17dd.');
+        test.equal(textformatted_17[1], '17 a, 17 m, 17 sem, 17 días');
+        test.equal(textformatted_17[2], '17a, 17m, 17sem, 17d');
+        test.equal(textformatted_17[3], '17a 17m 17sem 17d');
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
 
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17min, 17s');
-        test.equal(clockformatted_17[3], '17h 17min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17 s');
+        test.equal(clockformatted_17[3], '17h 17min 17 s');
 
         test.done();
     },
@@ -2629,13 +2629,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
 
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2 s');
+        test.equal(clockformatted_2[3], '2h 2min 2 s');
 
         test.done();
     },
@@ -2662,7 +2662,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_16[0], '16 años, 16 meses, 16 semanas y 16 días');
         test.equal(textformatted_16[1], '16 aa., 16 mm., 16 sems., 16 dd.');
         test.equal(textformatted_16[2], '16aa., 16mm., 16sems., 16dd.');
@@ -2670,13 +2670,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_16[0], '16 horas, 16 minutos y 16 segundos');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16min, 16s');
-        test.equal(clockformatted_16[3], '16h 16min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16 s');
+        test.equal(clockformatted_16[3], '16h 16min 16 s');
 
         test.done();
     },
@@ -2703,7 +2703,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a, 1 kuu, 1 näd, 1 päev');
         test.equal(textformatted_1[2], '1 a, 1 k, 1 n, 1 p');
         test.equal(textformatted_1[3], '1 a 1 k 1 n 1 p');
-    
+
         test.equal(textformatted_2[0], '2 aastat, 2 kuud, 2 nädalat, 2 ööpäeva');
         test.equal(textformatted_2[1], '2 a, 2 kuud, 2 näd, 2 päeva');
         test.equal(textformatted_2[2], '2 a, 2 k, 2 n, 2 p');
@@ -2713,7 +2713,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 t, 1 min, 1 sek');
         test.equal(clockformatted_1[2], '1 t, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 t 1 min 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 tundi, 2 minutit, 2 sekundit');
         test.equal(clockformatted_2[1], '2 t, 2 min, 2 sek');
         test.equal(clockformatted_2[2], '2 t, 2 min, 2 s');
@@ -2828,7 +2828,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 v, 1 kk, 1 vk, 1 pv');
         test.equal(textformatted_1[2], '1v, 1kk, 1vk, 1pv');
         test.equal(textformatted_1[3], '1v 1kk 1vk 1pv')
-    
+
         test.equal(textformatted_17[0], '17 vuotta, 17 kuukautta, 17 viikkoa ja 17 päivää');
         test.equal(textformatted_17[1], '17 v, 17 kk, 17 vk, 17 pv');
         test.equal(textformatted_17[2], '17v, 17kk, 17vk, 17pv');
@@ -2877,13 +2877,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 heures, 16 minutes et 16 secondes');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16 min, 16s');
-        test.equal(clockformatted_16[3], '16h 16 min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -2906,23 +2906,23 @@ module.exports.testdurfmt2 = {
             clockformatted_17.push(textfmt.format({hour: 17,minute: 17,second: 17}).toString());
         }
 
-        test.equal(textformatted_1[0], '1 an, 1 mois, 1 semaine et 1 jour');
-        test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
+        test.equal(textformatted_1[0], '1 an, 1 mois, 1 semaine et 1 jour');
+        test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m, 1sem, 1j');
         test.equal(textformatted_1[3], '1a 1m 1sem 1j');
 
-        test.equal(textformatted_17[0], '17 ans, 17 mois, 17 semaines et 17 jours');
-        test.equal(textformatted_17[1], '17 ans, 17 m., 17 sem., 17 j');
+        test.equal(textformatted_17[0], '17 ans, 17 mois, 17 semaines et 17 jours');
+        test.equal(textformatted_17[1], '17 ans, 17 m., 17 sem., 17 j');
         test.equal(textformatted_17[2], '17a, 17m, 17sem, 17j');
         test.equal(textformatted_17[3], '17a 17m 17sem 17j');
 
-        test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
-        test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
+        test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
+        test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
-        test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
-        test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
+
+        test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
+        test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
         test.equal(clockformatted_17[2], '17h, 17m, 17s');
         test.equal(clockformatted_17[3], '17h 17m 17s');
 
@@ -2959,13 +2959,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17 min, 17s');
-        test.equal(clockformatted_17[3], '17h 17 min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -3002,13 +3002,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17 min, 17s');
-        test.equal(clockformatted_17[3], '17h 17 min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -3044,13 +3044,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 heures, 16 minutes et 16 secondes');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16 min, 16s');
-        test.equal(clockformatted_16[3], '16h 16 min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -3156,7 +3156,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 વર્ષ, 1 મહિનો, 1 અઠ., 1 દિવસ');
         test.equal(textformatted_1[2], '1 વ, 1 મ, 1 અઠ., 1 દિ');
         test.equal(textformatted_1[3], '1 વ, 1 મ, 1 અઠ., 1 દિ');
-    
+
         test.equal(textformatted_2[0], '2 વર્ષ, 2 મહિના, 2 અઠવાડિયા, 2 દિવસ');
         test.equal(textformatted_2[1], '2 વર્ષ, 2 મહિના, 2 અઠ., 2 દિવસ');
         test.equal(textformatted_2[2], '2 વ, 2 મ, 2 અઠ., 2 દિ');
@@ -3166,7 +3166,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 કલાક, 1 મિનિટ, 1 સેકંડ');
         test.equal(clockformatted_1[2], '1 ક, 1 મિ, 1 સે');
         test.equal(clockformatted_1[3], '1 ક, 1 મિ, 1 સે');
-    
+
         test.equal(clockformatted_2[0], '2 કલાક, 2 મિનિટ, 2 સેકંડ');
         test.equal(clockformatted_2[1], '2 કલાક, 2 મિનિટ, 2 સેકંડ');
         test.equal(clockformatted_2[2], '2 ક, 2 મિ, 2 સે');
@@ -3204,7 +3204,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '‏שנה 1, חודש, שבוע 1, יום');
         test.equal(textformatted_1[2], '‏ש′ 1 ח׳ 1 ש′ 1 י׳');
         test.equal(textformatted_1[3], '‏ש′ 1 ח׳ 1 ש′ 1 י׳');
-    
+
         test.equal(textformatted_2[0], '‏שנתיים, חודשיים, שבועיים ויומיים');
         test.equal(textformatted_2[1], '‏2 שנים, חודשיים, שבועיים, יומיים');
         test.equal(textformatted_2[2], '‏2 ש′ 2 ח׳ 2 ש′ 2 י׳');
@@ -3234,7 +3234,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_20[1], '‏20 שע׳, 20 דק׳, 20 שנ׳');
         test.equal(clockformatted_20[2], '‏20 שע׳ 20 דק׳ 20 שנ׳');
         test.equal(clockformatted_20[3], '‏20 שע׳ 20 דק׳ 20 שנ׳');
-                                         
+
         test.equal(clockformatted_19[0], '‏19 שעות, 19 דקות ו19 שניות');
         test.equal(clockformatted_19[1], '‏19 שע׳, 19 דק׳, 19 שנ׳');
         test.equal(clockformatted_19[2], '‏19 שע׳ 19 דק׳ 19 שנ׳');
@@ -3295,7 +3295,7 @@ module.exports.testdurfmt2 = {
 
         var textformatted_1 = [],textformatted_2 = [], textformatted_5 =[];
         var clockformatted_1 = [],clockformatted_2 = [], clockformatted_5 = [];
-        
+
         for (var i=0; i<4; i++) {
             textfmt = new DurationFmt({locale: "hr-HR", style:"text", length:length[i]});
 
@@ -3312,7 +3312,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 g., 1 mj., 1 tj., 1 dan');
         test.equal(textformatted_1[2], '1 g., 1 mj., 1 tj., 1 d.');
         test.equal(textformatted_1[3], '1 g. 1 mj. 1 tj. 1 d.');
-    
+
         test.equal(textformatted_2[0], '2 godine, 2 mjeseca, 2 tjedna i 2 dana');
         test.equal(textformatted_2[1], '2 g., 2 mj., 2 tj., 2 dana');
         test.equal(textformatted_2[2], '2 g., 2 mj., 2 tj., 2 d.');
@@ -3327,7 +3327,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 h 1 m 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 sata, 2 minute i 2 sekunde');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
         test.equal(clockformatted_2[2], '2 h, 2 m, 2 s');
@@ -3366,7 +3366,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 g., 1 mj., 1 tj., 1 dan');
         test.equal(textformatted_1[2], '1 g., 1 mj., 1 tj., 1 d.');
         test.equal(textformatted_1[3], '1 g. 1 mj. 1 tj. 1 d.');
-    
+
         test.equal(textformatted_4[0], '4 godine, 4 mjeseca, 4 tjedna i 4 dana');
         test.equal(textformatted_4[1], '4 g., 4 mj., 4 tj., 4 dana');
         test.equal(textformatted_4[2], '4 g., 4 mj., 4 tj., 4 d.');
@@ -3381,7 +3381,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 h 1 m 1 s');
-    
+
         test.equal(clockformatted_4[0], '4 sata, 4 minute i 4 sekunde');
         test.equal(clockformatted_4[1], '4 h, 4 min, 4 s');
         test.equal(clockformatted_4[2], '4 h, 4 m, 4 s');
@@ -3420,7 +3420,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 g., 1 mj., 1 tj., 1 dan');
         test.equal(textformatted_1[2], '1 g., 1 mj., 1 tj., 1 d.');
         test.equal(textformatted_1[3], '1 g. 1 mj. 1 tj. 1 d.');
-    
+
         test.equal(textformatted_2[0], '2 godine, 2 mjeseca, 2 tjedna i 2 dana');
         test.equal(textformatted_2[1], '2 g., 2 mj., 2 tj., 2 dana');
         test.equal(textformatted_2[2], '2 g., 2 mj., 2 tj., 2 d.');
@@ -3435,7 +3435,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 h 1 m 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 sata, 2 minute i 2 sekunde');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
         test.equal(clockformatted_2[2], '2 h, 2 m, 2 s');
@@ -3472,7 +3472,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 thn, 1 bln, 1 mgg, 1 hr');
         test.equal(textformatted_1[2], '1thn, 1bln, 1mgg, 1hr');
         test.equal(textformatted_1[3], '1thn, 1bln, 1mgg, 1hr');
-    
+
         test.equal(textformatted_2[0], '2 tahun, 2 bulan, 2 minggu, 2 hari');
         test.equal(textformatted_2[1], '2 thn, 2 bln, 2 mgg, 2 hr');
         test.equal(textformatted_2[2], '2thn, 2bln, 2mgg, 2hr');
@@ -3482,7 +3482,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 j, 1 mnt, 1 dtk');
         test.equal(clockformatted_1[2], '1j, 1mnt, 1dtk');
         test.equal(clockformatted_1[3], '1j, 1mnt, 1dtk');
-    
+
         test.equal(clockformatted_2[0], '2 jam, 2 menit, 2 detik');
         test.equal(clockformatted_2[1], '2 j, 2 mnt, 2 dtk');
         test.equal(clockformatted_2[2], '2j, 2mnt, 2dtk');
@@ -3514,7 +3514,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 ár, 1 mán., 1 vika, 1 dagur');
         test.equal(textformatted_1[2], '1á, 1 mán., 1 v., 1 d.');
         test.equal(textformatted_1[3], '1á 1 mán. 1 v. 1 d.');
-    
+
         test.equal(textformatted_17[0], '17 ár, 17 mánuðir, 17 vikur og 17 dagar');
         test.equal(textformatted_17[1], '17 ár, 17 mán., 17 vikur, 17 dagar');
         test.equal(textformatted_17[2], '17á, 17 mán., 17 v., 17 d.');
@@ -3524,7 +3524,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 klst., 1 mín., 1 sek.');
         test.equal(clockformatted_1[2], '1 klst., 1 mín., 1 sek.');
         test.equal(clockformatted_1[3], '1 klst. 1 mín. 1 sek.');
-    
+
         test.equal(clockformatted_17[0], '17 klukkustundir, 17 mínútur og 17 sekúndur');
         test.equal(clockformatted_17[1], '17 klst., 17 mín., 17 sek.');
         test.equal(clockformatted_17[2], '17 klst., 17 mín., 17 sek.');
@@ -3556,7 +3556,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 anno, 1 mese, 1 settimana, 1 giorno');
         test.equal(textformatted_1[2], '1anno, 1 mese, 1sett., 1 g');
         test.equal(textformatted_1[3], '1anno 1 mese 1sett. 1 g'); // CLDR 34 change (month, day)
-    
+
         test.equal(textformatted_17[0], '17 anni, 17 mesi, 17 settimane e 17 giorni');
         test.equal(textformatted_17[1], '17 anni, 17 mesi, 17 settimane, 17 giorni');
         test.equal(textformatted_17[2], '17anni, 17 mesi, 17sett., 17gg');
@@ -3566,14 +3566,14 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1h, 1min, 1s');
         test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+
         test.equal(clockformatted_17[0], '17 ore, 17 minuti e 17 secondi');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
         test.equal(clockformatted_17[2], '17h, 17min, 17s');
         test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
-    }, 
+    },
     testDurFmt_it_IT: function(test) {
         test.expect(16);
         // 1 2
@@ -3598,7 +3598,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 anno, 1 mese, 1 settimana, 1 giorno');
         test.equal(textformatted_1[2], '1anno, 1 mese, 1sett., 1 g');
         test.equal(textformatted_1[3], '1anno 1 mese 1sett. 1 g'); // CLDR 34 change (month, day)
-    
+
         test.equal(textformatted_2[0], '2 anni, 2 mesi, 2 settimane e 2 giorni');
         test.equal(textformatted_2[1], '2 anni, 2 mesi, 2 settimane, 2 giorni');
         test.equal(textformatted_2[2], '2anni, 2 mesi, 2sett., 2gg');
@@ -3608,7 +3608,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1h, 1min, 1s');
         test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+
         test.equal(clockformatted_2[0], '2 ore, 2 minuti e 2 secondi');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
         test.equal(clockformatted_2[2], '2h, 2min, 2s');
@@ -3640,7 +3640,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 年 1 か月 1 週間 1 日');
         test.equal(textformatted_1[2], '1y1m1w1d');
         test.equal(textformatted_1[3], '1y1m1w1d');
-    
+
         test.equal(textformatted_16[0], '16 年 16 か月 16 週間 16 日');
         test.equal(textformatted_16[1], '16 年 16 か月 16 週間 16 日');
         test.equal(textformatted_16[2], '16y16m16w16d');
@@ -3650,7 +3650,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 時間 1 分 1 秒');
         test.equal(clockformatted_1[2], '1h1m1s');
         test.equal(clockformatted_1[3], '1h1m1s');
-    
+
         test.equal(clockformatted_16[0], '16 時間 16 分 16 秒');
         test.equal(clockformatted_16[1], '16 時間 16 分 16 秒');
         test.equal(clockformatted_16[2], '16h16m16s');
@@ -3682,7 +3682,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 ж. 1 ай 1 ап. 1 күн');
         test.equal(textformatted_1[2], '1 ж. 1 ай 1 ап. 1 к.');
         test.equal(textformatted_1[3], '1 ж. 1 ай 1 ап. 1 к.');
-    
+
         test.equal(textformatted_2[0], '2 жыл 2 ай 2 апта 2 тәулік');
         test.equal(textformatted_2[1], '2 ж. 2 ай 2 ап. 2 күн');
         test.equal(textformatted_2[2], '2 ж. 2 ай 2 ап. 2 к.');
@@ -3692,7 +3692,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 сағ 1 мин 1 с');
         test.equal(clockformatted_1[2], '1 сағ 1 мин 1 с');
         test.equal(clockformatted_1[3], '1 сағ 1 мин 1 с');
-    
+
         test.equal(clockformatted_2[0], '2 сағат 2 минут 2 секунд')
         test.equal(clockformatted_2[1], '2 сағ 2 мин 2 с');
         test.equal(clockformatted_2[2], '2 сағ 2 мин 2 с');
@@ -3722,19 +3722,19 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 ವರ್ಷ, 1 ತಿಂಗಳು, 1 ವಾರ, 1 ದಿನ');
         test.equal(textformatted_1[1], '1 ವರ್ಷ, 1 ತಿಂ., 1 ವಾರ, 1 ದಿನ');
-        test.equal(textformatted_1[2], '1ವ, 1ತಿಂ., 1ವಾರ, 1ದಿನ');
-        test.equal(textformatted_1[3], '1ವ, 1ತಿಂ., 1ವಾರ, 1ದಿನ');
+        test.equal(textformatted_1[2], '1ವ, 1ತಿಂ., 1ವಾ, 1ದಿ');
+        test.equal(textformatted_1[3], '1ವ, 1ತಿಂ., 1ವಾ, 1ದಿ');
 
         test.equal(textformatted_2[0], '2 ವರ್ಷಗಳು, 2 ತಿಂಗಳು, 2 ವಾರಗಳು, 2 ದಿನಗಳು');
         test.equal(textformatted_2[1], '2 ವರ್ಷಗಳು, 2 ತಿಂ., 2 ವಾರಗಳು, 2 ದಿನಗಳು');
-        test.equal(textformatted_2[2], '2ವ, 2ತಿಂ., 2ವಾರ, 2ದಿನ');
-        test.equal(textformatted_2[3], '2ವ, 2ತಿಂ., 2ವಾರ, 2ದಿನ');
+        test.equal(textformatted_2[2], '2ವ, 2ತಿಂ., 2ವಾ, 2ದಿ');
+        test.equal(textformatted_2[3], '2ವ, 2ತಿಂ., 2ವಾ, 2ದಿ');
 
         test.equal(clockformatted_1[0], '1 ಗಂಟೆ, 1 ನಿಮಿಷ, 1 ಸೆಕೆಂಡ್');
         test.equal(clockformatted_1[1], '1 ಗಂ., 1 ನಿಮಿ, 1 ಸೆಕೆಂ');
         test.equal(clockformatted_1[2], '1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ');
         test.equal(clockformatted_1[3], '1ಗಂ., 1ನಿಮಿ, 1ಸೆಕೆಂ');
-    
+
         test.equal(clockformatted_2[0], '2 ಗಂಟೆಗಳು, 2 ನಿಮಿಷಗಳು, 2 ಸೆಕೆಂಡುಗಳು');
         test.equal(clockformatted_2[1], '2 ಗಂ., 2 ನಿಮಿ, 2 ಸೆಕೆಂ');
         test.equal(clockformatted_2[2], '2ಗಂ., 2ನಿಮಿ, 2 ಸೆಕೆಂ');
@@ -3766,7 +3766,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1년 1개월 1주 1일');
         test.equal(textformatted_1[2], '1년 1개월 1주 1일');
         test.equal(textformatted_1[3], '1년 1개월 1주 1일');
-    
+
         test.equal(textformatted_2[0], '2년 2개월 2주 2일');
         test.equal(textformatted_2[1], '2년 2개월 2주 2일');
         test.equal(textformatted_2[2], '2년 2개월 2주 2일');
@@ -3776,7 +3776,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1시간 1분 1초');
         test.equal(clockformatted_1[2], '1시간 1분 1초');
         test.equal(clockformatted_1[3], '1시간 1분 1초');
-    
+
         test.equal(clockformatted_2[0], '2시간 2분 2초');
         test.equal(clockformatted_2[1], '2시간 2분 2초');
         test.equal(clockformatted_2[2], '2시간 2분 2초');
@@ -3808,7 +3808,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '‏1 ساڵ 1 مانگ 1 هەفتە 1 رۆژ');
         test.equal(textformatted_1[2], '‏1س 1م 1ﻪـ 1ر');
         test.equal(textformatted_1[3], '‏1س 1م 1ﻪـ 1ر');
-    
+
         test.equal(textformatted_2[0], '‏2 ساڵ, 2 مانگ, 2 هەفتە,  2 رۆژ');
         test.equal(textformatted_2[1], '‏2 ساڵ 2 مانگ 2 هەفتە 2 رۆژ');
         test.equal(textformatted_2[2], '‏2س 2م 2ﻪـ 2ر');
@@ -3818,7 +3818,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '‏1 کاتژ 1 خول 1 چرک');
         test.equal(clockformatted_1[2], '‏1ک 1خ 1چ');
         test.equal(clockformatted_1[3], '‏1ک 1خ 1چ');
-    
+
         test.equal(clockformatted_2[0], '‏2 کاتژمێر, 2 خولەک,  2 چرکە');
         test.equal(clockformatted_2[1], '‏2 کاتژ 2 خول 2 چرک');
         test.equal(clockformatted_2[2], '‏2ک 2خ 2چ' );
@@ -3842,7 +3842,7 @@ module.exports.testdurfmt2 = {
             textformatted_21.push(textfmt.format({year: 21,month: 21,week: 21,day: 21}).toString());
             textformatted_9.push(textfmt.format({year: 9,month: 9,week: 9,day: 9}).toString());
             textformatted_11.push(textfmt.format({year: 11,month: 11,week: 11,day: 11}).toString());
-            
+
             clockformatted_21.push(textfmt.format({hour: 21,minute: 21,second: 21}).toString());
             clockformatted_9.push(textfmt.format({hour: 9,minute: 9,second: 9}).toString());
             clockformatted_11.push(textfmt.format({hour: 11,minute: 11,second: 11}).toString());
@@ -3852,7 +3852,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_21[1], '21 m. 21 mėn. 21 sav. 21 d.');
         test.equal(textformatted_21[2], '21 m. 21 mėn. 21 sav. 21 d.');
         test.equal(textformatted_21[3], '21 m. 21 mėn. 21 sav. 21 d.');
-    
+
         test.equal(textformatted_9[0], '9 metai 9 mėnesiai 9 savaitės ir 9 dienos');
         test.equal(textformatted_9[1], '9 m. 9 mėn. 9 sav. 9 d.');
         test.equal(textformatted_9[2], '9 m. 9 mėn. 9 sav. 9 d.');
@@ -3867,7 +3867,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_21[1], '21 val. 21 min. 21 sek.');
         test.equal(clockformatted_21[2], '21 h 21 min. 21 s');
         test.equal(clockformatted_21[3], '21 h 21 min. 21 s');
-    
+
         test.equal(clockformatted_9[0], '9 valandos 9 minutės ir 9 sekundės');
         test.equal(clockformatted_9[1], '9 val. 9 min. 9 sek.');
         test.equal(clockformatted_9[2], '9 h 9 min. 9 s');
@@ -3892,33 +3892,33 @@ module.exports.testdurfmt2 = {
 
         for (var i=0; i<4; i++) {
             textfmt = new DurationFmt({locale: "lv-LV", style:"text", length:length[i]});
-            
+
             textformatted_21.push(textfmt.format({year: 21,month: 21,week: 21,day: 21}).toString());
             textformatted_9.push(textfmt.format({year: 9,month: 9,week: 9,day: 9}).toString());
-        
+
             clockformatted_21.push(textfmt.format({hour: 21,minute: 21,second: 21}).toString());
             clockformatted_9.push(textfmt.format({hour: 9,minute: 9,second: 9}).toString());
         }
-        
+
         test.equal(textformatted_21[0], '21 gads, 21 mēnesis, 21 nedēļa un 21 diena');
         test.equal(textformatted_21[1], '21 g., 21 mēn., 21 ned., 21 d.');
-        test.equal(textformatted_21[2], '21 g., 21 m., 21 n., 21d');
-        test.equal(textformatted_21[3], '21 g. 21 m. 21 n. 21d'); // CLDR 34 change (year, month, week)
+        test.equal(textformatted_21[2], '21 g., 21 m., 21 n., 21 d.');
+        test.equal(textformatted_21[3], '21 g. 21 m. 21 n. 21 d.'); // CLDR 34 change (year, month, week)
 
         test.equal(textformatted_9[0], '9 gadi, 9 mēneši, 9 nedēļas un 9 dienas');
         test.equal(textformatted_9[1], '9 g., 9 mēn., 9 ned., 9 d.');
-        test.equal(textformatted_9[2], '9 g., 9 m., 9 n., 9d');
-        test.equal(textformatted_9[3], '9 g. 9 m. 9 n. 9d'); // CLDR 34 change (year, month, week)
-        
+        test.equal(textformatted_9[2], '9 g., 9 m., 9 n., 9 d.');
+        test.equal(textformatted_9[3], '9 g. 9 m. 9 n. 9 d.');
+
         test.equal(clockformatted_21[0], '21 stunda, 21 minūte un 21 sekunde');
         test.equal(clockformatted_21[1], '21 st., 21 min., 21 sek.');
-        test.equal(clockformatted_21[2], '21h, 21 min, 21s');
-        test.equal(clockformatted_21[3], '21h 21 min 21s');
+        test.equal(clockformatted_21[2], '21 h, 21 min, 21 s');
+        test.equal(clockformatted_21[3], '21 h 21 min 21 s');
 
         test.equal(clockformatted_9[0], '9 stundas, 9 minūtes un 9 sekundes');
-        test.equal(clockformatted_9[1], '9 st., 9 min., 9 sek.');
-        test.equal(clockformatted_9[2], '9h, 9 min, 9s');
-        test.equal(clockformatted_9[3], '9h 9 min 9s');
+        test.equal(clockformatted_9[1], '9 st., 9 min, 9 sek.');
+        test.equal(clockformatted_9[2], '9 h, 9 min, 9 s');
+        test.equal(clockformatted_9[3], '9 h 9 min 9 s');
 
         test.done();
     },
@@ -3948,7 +3948,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 год., 1 мес., 1 сед., 1 ден');
         test.equal(textformatted_1[2], '1 г., 1 м., 1 с., 1 д.');
         test.equal(textformatted_1[3], '1 г., 1 м., 1 с., 1 д.');
-    
+
         test.equal(textformatted_2[0], '2 години, 2 месеци, 2 седмици и 2 дена');
         test.equal(textformatted_2[1], '2 год., 2 мес., 2 сед., 2 дена');
         test.equal(textformatted_2[2], '2 г., 2 м., 2 с., 2 д.');
@@ -3958,7 +3958,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ч., 1 мин., 1 сек.');
         test.equal(clockformatted_1[2], '1 ч., 1 м., 1 с.');
         test.equal(clockformatted_1[3], '1 ч., 1 м., 1 с.');
-    
+
         test.equal(clockformatted_2[0], '2 часа, 2 минути и 2 секунди');
         test.equal(clockformatted_2[1], '2 ч., 2 мин., 2 сек.');
         test.equal(clockformatted_2[2], '2 ч., 2 м., 2 с.');
@@ -3990,7 +3990,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 വ, 1 മാസം, 1 ആ, 1 ദിവസം‌');
         test.equal(textformatted_1[2], '1 വ 1 മാ 1 ആ 1 ദി');
         test.equal(textformatted_1[3], '1 വ 1 മാ 1 ആ 1 ദി');
-    
+
         test.equal(textformatted_2[0], '2 വർഷം, 2 മാസം, 2 ആഴ്ച, 2 ദിവസം');
         test.equal(textformatted_2[1], '2 വ, 2 മാസം, 2 ആ, 2 ദിവസം‌');
         test.equal(textformatted_2[2], '2 വ 2 മാ 2 ആ 2 ദി');
@@ -4000,7 +4000,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 മ, 1 മി., 1 സെ.');
         test.equal(clockformatted_1[2], '1 മ 1 മി. 1 സെ.');
         test.equal(clockformatted_1[3], '1 മ 1 മി. 1 സെ.');
-    
+
         test.equal(clockformatted_2[0], '2 മണിക്കൂർ, 2 മിനിറ്റ്, 2 സെക്കൻഡ്');
         test.equal(clockformatted_2[1], '2 മ, 2 മി., 2 സെ.');
         test.equal(clockformatted_2[2], '2 മ 2 മി. 2 സെ.');
@@ -4032,7 +4032,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 वर्ष, 1 महिना, 1 आ, 1 दिवस');
         test.equal(textformatted_1[2], '1व 1म 1आ 1दि');
         test.equal(textformatted_1[3], '1व 1म 1आ 1दि');
-    
+
         test.equal(textformatted_18[0], '18 वर्षे, 18 महिने, 18 आठवडे, 18 दिवस');
         test.equal(textformatted_18[1], '18 वर्षे, 18 महिने, 18 आ, 18 दिवस');
         test.equal(textformatted_18[2], '18व 18म 18आ 18दि');
@@ -4042,7 +4042,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ता, 1 मिनि, 1 से');
         test.equal(clockformatted_1[2], '1ता 1मि 1से');
         test.equal(clockformatted_1[3], '1ता 1मि 1से');
-    
+
         test.equal(clockformatted_18[0], '18 तास, 18 मिनिटे, 18 सेकंद');
         test.equal(clockformatted_18[1], '18 ता, 18 मिनि, 18 से');
         test.equal(clockformatted_18[2], '18ता 18मि 18से');
@@ -4074,7 +4074,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 thn, 1 bln, 1 mgu, 1 hari');
         test.equal(textformatted_1[2], '1 thn, 1 bln, 1 mgu, 1 h');
         test.equal(textformatted_1[3], '1 thn 1 bln 1 mgu 1 h');
-    
+
         test.equal(textformatted_2[0], '2 tahun, 2 bulan, 2 minggu, 2 hari');
         test.equal(textformatted_2[1], '2 thn, 2 bln, 2 mgu, 2 hari');
         test.equal(textformatted_2[2], '2 thn, 2 bln, 2 mgu, 2 h');
@@ -4084,7 +4084,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 j, 1 min, 1 saat');
         test.equal(clockformatted_1[2], '1 j, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 j 1 min 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 jam, 2 minit, 2 saat');
         test.equal(clockformatted_2[1], '2 j, 2 min, 2 saat');
         test.equal(clockformatted_2[2], '2 j, 2 min, 2 s');
@@ -4116,7 +4116,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 år, 1 md., 1 u, 1 d');
         test.equal(textformatted_1[2], '1å, 1 m, 1u, 1d');
         test.equal(textformatted_1[3], '1å, 1 m, 1u, 1d');
-    
+
         test.equal(textformatted_2[0], '2 år, 2 måneder, 2 uker og 2 døgn');
         test.equal(textformatted_2[1], '2 år, 2 md., 2 u, 2 d');
         test.equal(textformatted_2[2], '2å, 2 m, 2u, 2d');
@@ -4126,7 +4126,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 t, 1 min, 1 sek');
         test.equal(clockformatted_1[2], '1t, 1m, 1s');
         test.equal(clockformatted_1[3], '1t, 1m, 1s');
-    
+
         test.equal(clockformatted_2[0], '2 timer, 2 minutter og 2 sekunder');
         test.equal(clockformatted_2[1], '2 t, 2 min, 2 sek');
         test.equal(clockformatted_2[2], '2t, 2m, 2s');
@@ -4158,7 +4158,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 jr, 1 mnd, 1 wk, 1 dag');
         test.equal(textformatted_1[2], '1 jr, 1 m, 1 w, 1 d');
         test.equal(textformatted_1[3], '1 jr, 1 m, 1 w, 1 d');
-    
+
         test.equal(textformatted_2[0], '2 jaar, 2 maanden, 2 weken en 2 dagen');
         test.equal(textformatted_2[1], '2 jr, 2 mnd, 2 wkn, 2 dagen');
         test.equal(textformatted_2[2], '2 jr, 2 m, 2 w, 2 d');
@@ -4168,7 +4168,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 uur, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1 u, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 u, 1 m, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 uur, 2 minuten en 2 seconden');
         test.equal(clockformatted_2[1], '2 uur, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2 u, 2 m, 2 s');
@@ -4200,7 +4200,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 jr, 1 mnd, 1 wk, 1 dag');
         test.equal(textformatted_1[2], '1 jr, 1 m, 1 w, 1 d');
         test.equal(textformatted_1[3], '1 jr, 1 m, 1 w, 1 d');
-    
+
         test.equal(textformatted_2[0], '2 jaar, 2 maanden, 2 weken en 2 dagen');
         test.equal(textformatted_2[1], '2 jr, 2 mnd, 2 wkn, 2 dagen');
         test.equal(textformatted_2[2], '2 jr, 2 m, 2 w, 2 d');
@@ -4210,7 +4210,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 uur, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1 u, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 u, 1 m, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 uur, 2 minuten en 2 seconden');
         test.equal(clockformatted_2[1], '2 uur, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2 u, 2 m, 2 s');
@@ -4243,33 +4243,33 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ');
         test.equal(textformatted_1[1], '1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ');
-        test.equal(textformatted_1[2], '1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ');
-        test.equal(textformatted_1[3], '1 ਸਾਲ, 1 ਮਹੀਨਾ, 1 ਹਫ਼ਤਾ, 1 ਦਿਨ');
+        test.equal(textformatted_1[2], '1 ਸਾਲ 1 ਮਹੀਨਾ 1 ਹਫ਼ਤਾ 1 ਦਿਨ');
+        test.equal(textformatted_1[3], '1 ਸਾਲ 1 ਮਹੀਨਾ 1 ਹਫ਼ਤਾ 1 ਦਿਨ');
 
         test.equal(textformatted_2[0], '2 ਸਾਲ, 2 ਮਹੀਨੇ, 2 ਹਫ਼ਤੇ, 2 ਦਿਨ');
         test.equal(textformatted_2[1], '2 ਸਾਲ, 2 ਮਹੀਨੇ, 2 ਹਫ਼ਤੇ, 2 ਦਿਨ');
-        test.equal(textformatted_2[2], '2 ਸਾਲ, 2 ਮਹੀਨੇ, 2 ਹਫ਼ਤੇ, 2 ਦਿਨ');
-        test.equal(textformatted_2[3], '2 ਸਾਲ, 2 ਮਹੀਨੇ, 2 ਹਫ਼ਤੇ, 2 ਦਿਨ');
+        test.equal(textformatted_2[2], '2 ਸਾਲ 2 ਮਹੀਨੇ 2 ਹਫ਼ਤੇ 2 ਦਿਨ');
+        test.equal(textformatted_2[3], '2 ਸਾਲ 2 ਮਹੀਨੇ 2 ਹਫ਼ਤੇ 2 ਦਿਨ');
 
         test.equal(textformatted_18[0], '18 ਸਾਲ, 18 ਮਹੀਨੇ, 18 ਹਫ਼ਤੇ, 18 ਦਿਨ');
         test.equal(textformatted_18[1], '18 ਸਾਲ, 18 ਮਹੀਨੇ, 18 ਹਫ਼ਤੇ, 18 ਦਿਨ');
-        test.equal(textformatted_18[2], '18 ਸਾਲ, 18 ਮਹੀਨੇ, 18 ਹਫ਼ਤੇ, 18 ਦਿਨ');
-        test.equal(textformatted_18[3], '18 ਸਾਲ, 18 ਮਹੀਨੇ, 18 ਹਫ਼ਤੇ, 18 ਦਿਨ');
+        test.equal(textformatted_18[2], '18 ਸਾਲ 18 ਮਹੀਨੇ 18 ਹਫ਼ਤੇ 18 ਦਿਨ');
+        test.equal(textformatted_18[3], '18 ਸਾਲ 18 ਮਹੀਨੇ 18 ਹਫ਼ਤੇ 18 ਦਿਨ');
 
         test.equal(clockformatted_1[0], '1 ਘੰਟਾ, 1 ਮਿੰਟ, 1 ਸਕਿੰਟ');
         test.equal(clockformatted_1[1], '1 ਘੰਟਾ, 1 ਮਿੰਟ, 1 ਸਕਿੰਟ');
-        test.equal(clockformatted_1[2], '1 ਘੰਟਾ, 1 ਮਿੰਟ, 1 ਸਕਿੰਟ');
-        test.equal(clockformatted_1[3], '1 ਘੰਟਾ, 1 ਮਿੰਟ, 1 ਸਕਿੰਟ');
-                                        
+        test.equal(clockformatted_1[2], '1 ਘੰਟਾ 1 ਮਿੰਟ 1 ਸਕਿੰਟ');
+        test.equal(clockformatted_1[3], '1 ਘੰਟਾ 1 ਮਿੰਟ 1 ਸਕਿੰਟ');
+
         test.equal(clockformatted_2[0], '2 ਘੰਟੇ, 2 ਮਿੰਟ, 2 ਸਕਿੰਟ');
         test.equal(clockformatted_2[1], '2 ਘੰਟੇ, 2 ਮਿੰਟ, 2 ਸਕਿੰਟ');
-        test.equal(clockformatted_2[2], '2 ਘੰਟੇ, 2 ਮਿੰਟ, 2 ਸਕਿੰਟ');
-        test.equal(clockformatted_2[3], '2 ਘੰਟੇ, 2 ਮਿੰਟ, 2 ਸਕਿੰਟ');
+        test.equal(clockformatted_2[2], '2 ਘੰਟੇ 2 ਮਿੰਟ 2 ਸਕਿੰਟ');
+        test.equal(clockformatted_2[3], '2 ਘੰਟੇ 2 ਮਿੰਟ 2 ਸਕਿੰਟ');
 
         test.equal(clockformatted_18[0], '18 ਘੰਟੇ, 18 ਮਿੰਟ, 18 ਸਕਿੰਟ');
         test.equal(clockformatted_18[1], '18 ਘੰਟੇ, 18 ਮਿੰਟ, 18 ਸਕਿੰਟ');
-        test.equal(clockformatted_18[2], '18 ਘੰਟੇ, 18 ਮਿੰਟ, 18 ਸਕਿੰਟ');
-        test.equal(clockformatted_18[3], '18 ਘੰਟੇ, 18 ਮਿੰਟ, 18 ਸਕਿੰਟ');
+        test.equal(clockformatted_18[2], '18 ਘੰਟੇ 18 ਮਿੰਟ 18 ਸਕਿੰਟ');
+        test.equal(clockformatted_18[3], '18 ਘੰਟੇ 18 ਮਿੰਟ 18 ਸਕਿੰਟ');
 
         test.done();
     },
@@ -4299,7 +4299,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 rok, 1 mies., 1 tydz., 1 dzień');
         test.equal(textformatted_1[2], '1 r., 1 m-c, 1 tydz., 1 d.');
         test.equal(textformatted_1[3], '1 r., 1 m-c, 1 tydz., 1 d.');
-    
+
         test.equal(textformatted_2[0], '2 lata, 2 miesiące, 2 tygodnie i 2 dni');
         test.equal(textformatted_2[1], '2 lata, 2 mies., 2 tyg., 2 dni');
         test.equal(textformatted_2[2], '2 l., 2 m-ce, 2 tyg., 2 dn.');
@@ -4314,7 +4314,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 godz., 1 min, 1 sek.');
         test.equal(clockformatted_1[2], '1 g., 1 min, 1 s'); // CLDR 34 change (hour)
         test.equal(clockformatted_1[3], '1 g., 1 min, 1 s'); // CLDR 34 change (hour)
-    
+
         test.equal(clockformatted_2[0], '2 godziny, 2 minuty i 2 sekundy');
         test.equal(clockformatted_2[1], '2 godz., 2 min, 2 sek.');
         test.equal(clockformatted_2[2], '2 g., 2 min, 2 s'); // CLDR 34 change (hour)
@@ -4349,22 +4349,22 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[0], '1 ano, 1 mês, 1 semana e 1 dia');
         test.equal(textformatted_1[1], '1 ano, 1 mês, 1 sem., 1 dia');
         test.equal(textformatted_1[2], '1 ano, 1 mês, 1 sem., 1 dia');
-        test.equal(textformatted_1[3], '1 ano, 1 mês, 1 sem., 1 dia');
-    
+        test.equal(textformatted_1[3], '1 ano 1 mês 1 sem. 1 dia');
+
         test.equal(textformatted_2[0], '2 anos, 2 meses, 2 semanas e 2 dias');
         test.equal(textformatted_2[1], '2 anos, 2 meses, 2 sem., 2 dias');
         test.equal(textformatted_2[2], '2 anos, 2 meses, 2 sem., 2 dias');
-        test.equal(textformatted_2[3], '2 anos, 2 meses, 2 sem., 2 dias');
+        test.equal(textformatted_2[3], '2 anos 2 meses 2 sem. 2 dias');
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto e 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 seg');
         test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[3], '1 h, 1 min, 1 s');
-    
+        test.equal(clockformatted_1[3], '1 h 1 min 1 s');
+
         test.equal(clockformatted_2[0], '2 horas, 2 minutos e 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 seg');
         test.equal(clockformatted_2[2], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[3], '2 h, 2 min, 2 s');
+        test.equal(clockformatted_2[3], '2 h 2 min 2 s');
 
         test.done();
     },
@@ -4391,7 +4391,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 ano, 1 mês, 1 sem., 1 dia');
         test.equal(textformatted_1[2], '1 ano, 1 mês, 1 sem., 1 dia');
         test.equal(textformatted_1[3], '1 ano, 1 mês, 1 sem., 1 dia');
-    
+
         test.equal(textformatted_17[0], '17 anos, 17 meses, 17 semanas e 17 dias');
         test.equal(textformatted_17[1], '17 anos, 17 meses, 17 sem., 17 dias');
         test.equal(textformatted_17[2], '17 anos, 17 meses, 17 sem., 17 dias');
@@ -4401,7 +4401,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 h, 1 min, 1 s');
-    
+
         test.equal(clockformatted_17[0], '17 horas, 17 minutos e 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
         test.equal(clockformatted_17[2], '17 h, 17 min, 17 s');
@@ -4435,7 +4435,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 lună, 1 săpt., 1 zi');
         test.equal(textformatted_1[2], '1 a, 1 l, 1 săpt., 1 z');
         test.equal(textformatted_1[3], '1 a, 1 l, 1 săpt., 1 z');
-    
+
         test.equal(textformatted_2[0], '2 ani, 2 luni, 2 săptămâni, 2 zile');
         test.equal(textformatted_2[1], '2 ani, 2 luni, 2 săpt., 2 zile');
         test.equal(textformatted_2[2], '2 a, 2 l, 2 săpt., 2 z');
@@ -4450,7 +4450,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 oră, 1 min., 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 h, 1 m, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 ore, 2 minute, 2 secunde');
         test.equal(clockformatted_2[1], '2 ore, 2 min., 2 s');
         test.equal(clockformatted_2[2], '2 h, 2 m, 2 s');
@@ -4485,7 +4485,7 @@ module.exports.testdurfmt2 = {
             clockformatted_4.push(textfmt.format({hour: 4,minute: 4,second: 4}).toString());
             clockformatted_20.push(textfmt.format({hour: 20,minute: 20,second: 20}).toString());
         }
-        
+
         test.equal(textformatted_1[0], '1 година, 1 месец, 1 недеља и 1 дан');
         test.equal(textformatted_1[1], '1 год, 1 мес., 1 нед., 1 дан');
         test.equal(textformatted_1[2], '1 г, 1 м, 1 н, 1 д');
@@ -4495,7 +4495,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_4[1], '4 год., 4 мес., 4 нед., 4 дана');
         test.equal(textformatted_4[2], '4 г, 4 м, 4 н, 4 д');
         test.equal(textformatted_4[3], '4 г, 4 м, 4 н, 4 д');
-    
+
         test.equal(textformatted_20[0], '20 година, 20 месеци, 20 недеља и 20 дана');
         test.equal(textformatted_20[1], '20 год., 20 мес., 20 нед., 20 дана');
         test.equal(textformatted_20[2], '20 г, 20 м, 20 н, 20 д');
@@ -4510,7 +4510,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_4[1], '4 сата, 4 мин, 4 сек');
         test.equal(clockformatted_4[2], '4 ч, 4 м, 4 с');
         test.equal(clockformatted_4[3], '4 ч, 4 м, 4 с');
-    
+
         test.equal(clockformatted_20[0], '20 сати, 20 минута и 20 секунди');
         test.equal(clockformatted_20[1], '20 сати, 20 мин, 20 сек');
         test.equal(clockformatted_20[2], '20 ч, 20 м, 20 с');
@@ -4544,7 +4544,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 god, 1 mes., 1 ned., 1 dan');
         test.equal(textformatted_1[2], '1 g, 1 m, 1 n, 1 d');
         test.equal(textformatted_1[3], '1 g, 1 m, 1 n, 1 d');
-    
+
         test.equal(textformatted_2[0], '2 godine, 2 meseca, 2 nedelje i 2 dana');
         test.equal(textformatted_2[1], '2 god., 2 mes., 2 ned., 2 dana');
         test.equal(textformatted_2[2], '2 g, 2 m, 2 n, 2 d');
@@ -4559,7 +4559,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 sat, 1 min, 1 sek');
         test.equal(clockformatted_1[2], '1 č, 1 m, 1 s');
         test.equal(clockformatted_1[3], '1 č, 1 m, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 sata, 2 minuta i 2 sekunde');
         test.equal(clockformatted_2[1], '2 sata, 2 min, 2 sek');
         test.equal(clockformatted_2[2], '2 č, 2 m, 2 s');
@@ -4598,7 +4598,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 г. 1 мес. 1 нед. 1 дн.');
         test.equal(textformatted_1[2], '1 г. 1 м. 1 н. 1 д.');
         test.equal(textformatted_1[3], '1 г. 1 м. 1 н. 1 д.');
-    
+
         test.equal(textformatted_2[0], '2 года 2 месяца 2 недели 2 дня');
         test.equal(textformatted_2[1], '2 г. 2 мес. 2 нед. 2 дн.');
         test.equal(textformatted_2[2], '2 г. 2 м. 2 н. 2 д.');
@@ -4610,17 +4610,17 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_5[3], '5 л. 5 м. 5 н. 5 д.');
 
         test.equal(clockformatted_1[0], '1 час 1 минута 1 секунда');
-        test.equal(clockformatted_1[1], '1 ч. 1 мин. 1 сек.');
+        test.equal(clockformatted_1[1], '1 ч 1 мин. 1 сек.');
         test.equal(clockformatted_1[2], '1 ч 1 мин 1 с');
         test.equal(clockformatted_1[3], '1 ч 1 мин 1 с');
-    
+
         test.equal(clockformatted_2[0], '2 часа 2 минуты 2 секунды');
-        test.equal(clockformatted_2[1], '2 ч. 2 мин. 2 сек.');
+        test.equal(clockformatted_2[1], '2 ч 2 мин. 2 сек.');
         test.equal(clockformatted_2[2], '2 ч 2 мин 2 с');
         test.equal(clockformatted_2[3], '2 ч 2 мин 2 с');
 
         test.equal(clockformatted_5[0], '5 часов 5 минут 5 секунд');
-        test.equal(clockformatted_5[1], '5 ч. 5 мин. 5 сек.'); // CLDR 34 change.
+        test.equal(clockformatted_5[1], '5 ч 5 мин. 5 сек.'); // CLDR 34 change.
         test.equal(clockformatted_5[2], '5 ч 5 мин 5 с');
         test.equal(clockformatted_5[3], '5 ч 5 мин 5 с');
 
@@ -4652,7 +4652,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_41[1], '41 г. 41 мес. 41 нед. 41 дн.');
         test.equal(textformatted_41[2], '41 г. 41 м. 41 н. 41 д.');
         test.equal(textformatted_41[3], '41 г. 41 м. 41 н. 41 д.');
-    
+
         test.equal(textformatted_24[0], '24 года 24 месяца 24 недели 24 дня');
         test.equal(textformatted_24[1], '24 г. 24 мес. 24 нед. 24 дн.');
         test.equal(textformatted_24[2], '24 г. 24 м. 24 н. 24 д.');
@@ -4664,17 +4664,17 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_25[3], '25 л. 25 м. 25 н. 25 д.');
 
         test.equal(clockformatted_41[0], '41 час 41 минута 41 секунда');
-        test.equal(clockformatted_41[1], '41 ч. 41 мин. 41 сек.');
+        test.equal(clockformatted_41[1], '41 ч 41 мин. 41 сек.');
         test.equal(clockformatted_41[2], '41 ч 41 мин 41 с');
         test.equal(clockformatted_41[3], '41 ч 41 мин 41 с');
-    
+
         test.equal(clockformatted_24[0], '24 часа 24 минуты 24 секунды');
-        test.equal(clockformatted_24[1], '24 ч. 24 мин. 24 сек.');
+        test.equal(clockformatted_24[1], '24 ч 24 мин. 24 сек.');
         test.equal(clockformatted_24[2], '24 ч 24 мин 24 с');
         test.equal(clockformatted_24[3], '24 ч 24 мин 24 с');
 
         test.equal(clockformatted_25[0], '25 часов 25 минут 25 секунд');
-        test.equal(clockformatted_25[1], '25 ч. 25 мин. 25 сек.'); // CLDR 34 change.
+        test.equal(clockformatted_25[1], '25 ч 25 мин. 25 сек.'); // CLDR 34 change.
         test.equal(clockformatted_25[2], '25 ч 25 мин 25 с');
         test.equal(clockformatted_25[3], '25 ч 25 мин 25 с');
 
@@ -4706,7 +4706,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_31[1], '31 г. 31 мес. 31 нед. 31 дн.');
         test.equal(textformatted_31[2], '31 г. 31 м. 31 н. 31 д.');
         test.equal(textformatted_31[3], '31 г. 31 м. 31 н. 31 д.');
-    
+
         test.equal(textformatted_22[0], '22 года 22 месяца 22 недели 22 дня');
         test.equal(textformatted_22[1], '22 г. 22 мес. 22 нед. 22 дн.');
         test.equal(textformatted_22[2], '22 г. 22 м. 22 н. 22 д.');
@@ -4718,17 +4718,17 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_20[3], '20 л. 20 м. 20 н. 20 д.');
 
         test.equal(clockformatted_31[0], '31 час 31 минута 31 секунда');
-        test.equal(clockformatted_31[1], '31 ч. 31 мин. 31 сек.');
+        test.equal(clockformatted_31[1], '31 ч 31 мин. 31 сек.');
         test.equal(clockformatted_31[2], '31 ч 31 мин 31 с');
         test.equal(clockformatted_31[3], '31 ч 31 мин 31 с');
-    
+
         test.equal(clockformatted_22[0], '22 часа 22 минуты 22 секунды');
-        test.equal(clockformatted_22[1], '22 ч. 22 мин. 22 сек.');
+        test.equal(clockformatted_22[1], '22 ч 22 мин. 22 сек.');
         test.equal(clockformatted_22[2], '22 ч 22 мин 22 с');
         test.equal(clockformatted_22[3], '22 ч 22 мин 22 с');
 
         test.equal(clockformatted_20[0], '20 часов 20 минут 20 секунд');
-        test.equal(clockformatted_20[1], '20 ч. 20 мин. 20 сек.'); // CLDR 34 change.
+        test.equal(clockformatted_20[1], '20 ч 20 мин. 20 сек.'); // CLDR 34 change.
         test.equal(clockformatted_20[2], '20 ч 20 мин 20 с');
         test.equal(clockformatted_20[3], '20 ч 20 мин 20 с');
 
@@ -4761,7 +4761,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_21[1], '21 г. 21 мес. 21 нед. 21 дн.');
         test.equal(textformatted_21[2], '21 г. 21 м. 21 н. 21 д.');
         test.equal(textformatted_21[3], '21 г. 21 м. 21 н. 21 д.');
-    
+
         test.equal(textformatted_4[0], '4 года 4 месяца 4 недели 4 дня');
         test.equal(textformatted_4[1], '4 г. 4 мес. 4 нед. 4 дн.');
         test.equal(textformatted_4[2], '4 г. 4 м. 4 н. 4 д.');
@@ -4773,17 +4773,17 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_19[3], '19 л. 19 м. 19 н. 19 д.');
 
         test.equal(clockformatted_21[0], '21 час 21 минута 21 секунда');
-        test.equal(clockformatted_21[1], '21 ч. 21 мин. 21 сек.');
+        test.equal(clockformatted_21[1], '21 ч 21 мин. 21 сек.');
         test.equal(clockformatted_21[2], '21 ч 21 мин 21 с');
         test.equal(clockformatted_21[3], '21 ч 21 мин 21 с');
-    
+
         test.equal(clockformatted_4[0], '4 часа 4 минуты 4 секунды');
-        test.equal(clockformatted_4[1], '4 ч. 4 мин. 4 сек.');
+        test.equal(clockformatted_4[1], '4 ч 4 мин. 4 сек.');
         test.equal(clockformatted_4[2], '4 ч 4 мин 4 с');
         test.equal(clockformatted_4[3], '4 ч 4 мин 4 с');
 
         test.equal(clockformatted_19[0], '19 часов 19 минут 19 секунд');
-        test.equal(clockformatted_19[1], '19 ч. 19 мин. 19 сек.'); // CLDR 34 change.
+        test.equal(clockformatted_19[1], '19 ч 19 мин. 19 сек.'); // CLDR 34 change.
         test.equal(clockformatted_19[2], '19 ч 19 мин 19 с');
         test.equal(clockformatted_19[3], '19 ч 19 мин 19 с');
 
@@ -4815,7 +4815,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_31[1], '31 г. 31 мес. 31 нед. 31 дн.');
         test.equal(textformatted_31[2], '31 г. 31 м. 31 н. 31 д.');
         test.equal(textformatted_31[3], '31 г. 31 м. 31 н. 31 д.');
-    
+
         test.equal(textformatted_32[0], '32 года 32 месяца 32 недели 32 дня');
         test.equal(textformatted_32[1], '32 г. 32 мес. 32 нед. 32 дн.');
         test.equal(textformatted_32[2], '32 г. 32 м. 32 н. 32 д.');
@@ -4827,17 +4827,17 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_19[3], '19 л. 19 м. 19 н. 19 д.');
 
         test.equal(clockformatted_31[0], '31 час 31 минута 31 секунда');
-        test.equal(clockformatted_31[1], '31 ч. 31 мин. 31 сек.');
+        test.equal(clockformatted_31[1], '31 ч 31 мин. 31 сек.');
         test.equal(clockformatted_31[2], '31 ч 31 мин 31 с');
         test.equal(clockformatted_31[3], '31 ч 31 мин 31 с');
-    
+
         test.equal(clockformatted_32[0], '32 часа 32 минуты 32 секунды');
-        test.equal(clockformatted_32[1], '32 ч. 32 мин. 32 сек.');
+        test.equal(clockformatted_32[1], '32 ч 32 мин. 32 сек.');
         test.equal(clockformatted_32[2], '32 ч 32 мин 32 с');
         test.equal(clockformatted_32[3], '32 ч 32 мин 32 с');
 
         test.equal(clockformatted_19[0], '19 часов 19 минут 19 секунд');
-        test.equal(clockformatted_19[1], '19 ч. 19 мин. 19 сек.'); // CLDR 34 change.
+        test.equal(clockformatted_19[1], '19 ч 19 мин. 19 сек.'); // CLDR 34 change.
         test.equal(clockformatted_19[2], '19 ч 19 мин 19 с');
         test.equal(clockformatted_19[3], '19 ч 19 мин 19 с');
 
@@ -4869,7 +4869,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 г. 1 мес. 1 нед. 1 дн.');
         test.equal(textformatted_1[2], '1 г. 1 м. 1 н. 1 д.');
         test.equal(textformatted_1[3], '1 г. 1 м. 1 н. 1 д.');
-    
+
         test.equal(textformatted_2[0], '2 года 2 месяца 2 недели 2 дня');
         test.equal(textformatted_2[1], '2 г. 2 мес. 2 нед. 2 дн.');
         test.equal(textformatted_2[2], '2 г. 2 м. 2 н. 2 д.');
@@ -4881,17 +4881,17 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_5[3], '5 л. 5 м. 5 н. 5 д.');
 
         test.equal(clockformatted_1[0], '1 час 1 минута 1 секунда');
-        test.equal(clockformatted_1[1], '1 ч. 1 мин. 1 сек.');
+        test.equal(clockformatted_1[1], '1 ч 1 мин. 1 сек.');
         test.equal(clockformatted_1[2], '1 ч 1 мин 1 с');
         test.equal(clockformatted_1[3], '1 ч 1 мин 1 с');
-    
+
         test.equal(clockformatted_2[0], '2 часа 2 минуты 2 секунды');
-        test.equal(clockformatted_2[1], '2 ч. 2 мин. 2 сек.');
+        test.equal(clockformatted_2[1], '2 ч 2 мин. 2 сек.');
         test.equal(clockformatted_2[2], '2 ч 2 мин 2 с');
         test.equal(clockformatted_2[3], '2 ч 2 мин 2 с');
 
         test.equal(clockformatted_5[0], '5 часов 5 минут 5 секунд');
-        test.equal(clockformatted_5[1], '5 ч. 5 мин. 5 сек.'); // CLDR 34 change.
+        test.equal(clockformatted_5[1], '5 ч 5 мин. 5 сек.');
         test.equal(clockformatted_5[2], '5 ч 5 мин 5 с');
         test.equal(clockformatted_5[3], '5 ч 5 мин 5 с');
 
@@ -4923,7 +4923,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 r., 1 mes., 1 týž., 1 deň');
         test.equal(textformatted_1[2], '1 r., 1 m., 1 t., 1 d.');
         test.equal(textformatted_1[3], '1 r., 1 m., 1 t., 1 d.');
-    
+
         test.equal(textformatted_2[0], '2 roky, 2 mesiace, 2 týždne, 2 dni');
         test.equal(textformatted_2[1], '2 r., 2 mes., 2 týž., 2 dni');
         test.equal(textformatted_2[2], '2 r., 2 m., 2 t., 2 d.');
@@ -4938,7 +4938,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 h, 1 min, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 hodiny, 2 minúty, 2 sekundy');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
         test.equal(clockformatted_2[2], '2 h, 2 min, 2 s');
@@ -4979,7 +4979,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 l, 1 m, 1 t, 1 d');
         test.equal(textformatted_1[2], '1 l, 1 m, 1 t, 1 d');
         test.equal(textformatted_1[3], '1 l, 1 m, 1 t, 1 d');
-    
+
         test.equal(textformatted_2[0], '2 leti, 2 meseca, 2 tedna in 2 dneva');
         test.equal(textformatted_2[1], '2 l, 2 m, 2 t, 2 d');
         test.equal(textformatted_2[2], '2 l, 2 m, 2 t, 2 d');
@@ -4999,7 +4999,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 sek.');
         test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 h, 1 min, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 uri, 2 minuti in 2 sekundi');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 sek.');
         test.equal(clockformatted_2[2], '2 h, 2 min, 2 s');
@@ -5041,7 +5041,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 vit, 1 muaj, 1 javë, 1 ditë');
         test.equal(textformatted_1[2], '1 vit, 1 muaj, 1 javë, 1 ditë');
         test.equal(textformatted_1[3], '1 vit, 1 muaj, 1 javë, 1 ditë');
-    
+
         test.equal(textformatted_16[0], '16 vjet, 16 muaj, 16 javë e 16 ditë');
         test.equal(textformatted_16[1], '16 vjet, 16 muaj, 16 javë, 16 ditë');
         test.equal(textformatted_16[2], '16 vjet, 16 muaj, 16 javë, 16 ditë');
@@ -5051,7 +5051,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 orë, 1 min., 1 sek.');
         test.equal(clockformatted_1[2], '1 orë, 1 min., 1 sek.');
         test.equal(clockformatted_1[3], '1 orë, 1 min., 1 sek.');
-    
+
         test.equal(clockformatted_16[0], '16 orë, 16 minuta e 16 sekonda');
         test.equal(clockformatted_16[1], '16 orë, 16 min., 16 sek.');
         test.equal(clockformatted_16[2], '16 orë, 16 min., 16 sek.');
@@ -5083,7 +5083,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 vit, 1 muaj, 1 javë, 1 ditë');
         test.equal(textformatted_1[2], '1 vit, 1 muaj, 1 javë, 1 ditë');
         test.equal(textformatted_1[3], '1 vit, 1 muaj, 1 javë, 1 ditë');
-    
+
         test.equal(textformatted_17[0], '17 vjet, 17 muaj, 17 javë e 17 ditë');
         test.equal(textformatted_17[1], '17 vjet, 17 muaj, 17 javë, 17 ditë');
         test.equal(textformatted_17[2], '17 vjet, 17 muaj, 17 javë, 17 ditë');
@@ -5093,7 +5093,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 orë, 1 min., 1 sek.');
         test.equal(clockformatted_1[2], '1 orë, 1 min., 1 sek.');
         test.equal(clockformatted_1[3], '1 orë, 1 min., 1 sek.');
-    
+
         test.equal(clockformatted_17[0], '17 orë, 17 minuta e 17 sekonda');
         test.equal(clockformatted_17[1], '17 orë, 17 min., 17 sek.');
         test.equal(clockformatted_17[2], '17 orë, 17 min., 17 sek.');
@@ -5125,7 +5125,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 år, 1 mån, 1 v, 1 d');
         test.equal(textformatted_1[2], '1å, 1m, 1v, 1d');
         test.equal(textformatted_1[3], '1å 1m 1v 1d');
-    
+
         test.equal(textformatted_2[0], '2 år, 2 månader, 2 veckor, 2 dygn');
         test.equal(textformatted_2[1], '2 år, 2 mån, 2 v, 2 d');
         test.equal(textformatted_2[2], '2å, 2m, 2v, 2d');
@@ -5135,7 +5135,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 tim, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 timmar, 2 minuter, 2 sekunder');
         test.equal(clockformatted_2[1], '2 tim, 2 min, 2 s');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -5167,7 +5167,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 år, 1 mån, 1 v, 1 d');
         test.equal(textformatted_1[2], '1å, 1m, 1v, 1d');
         test.equal(textformatted_1[3], '1å 1m 1v 1d');
-    
+
         test.equal(textformatted_17[0], '17 år, 17 månader, 17 veckor, 17 dygn');
         test.equal(textformatted_17[1], '17 år, 17 mån, 17 v, 17 d');
         test.equal(textformatted_17[2], '17å, 17m, 17v, 17d');
@@ -5177,7 +5177,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 tim, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_17[0], '17 timmar, 17 minuter, 17 sekunder');
         test.equal(clockformatted_17[1], '17 tim, 17 min, 17 s');
         test.equal(clockformatted_17[2], '17h, 17m, 17s');
@@ -5205,22 +5205,22 @@ module.exports.testdurfmt2 = {
             clockformatted_2.push(textfmt.format({hour: 2,minute: 2,second: 2}).toString());
         }
 
-        test.equal(textformatted_1[0], '1 ஆண்டு, 1 மாதம், 1 வாரம், 1 நாள்');
+        test.equal(textformatted_1[0], '1 ஆண்டு, 1 மாதம், 1 வாரம் மற்றும் 1 நாள்');
         test.equal(textformatted_1[1], '1 ஆண்டு, 1 மாதம், 1 வாரம், 1 நாள்');
         test.equal(textformatted_1[2], '1 ஆ 1 மா 1 வா 1 நா');
         test.equal(textformatted_1[3], '1 ஆ 1 மா 1 வா 1 நா');
-    
-        test.equal(textformatted_2[0], '2 ஆண்டுகள், 2 மாதங்கள், 2 வாரங்கள், 2 நாட்கள்');
+
+        test.equal(textformatted_2[0], '2 ஆண்டுகள், 2 மாதங்கள், 2 வாரங்கள் மற்றும் 2 நாட்கள்');
         test.equal(textformatted_2[1], '2 ஆண்டு., 2 மாத., 2 வார., 2 நாட்கள்');
         test.equal(textformatted_2[2], '2 ஆ 2 மா 2 வா 2 நா');
         test.equal(textformatted_2[3], '2 ஆ 2 மா 2 வா 2 நா');
 
-        test.equal(clockformatted_1[0], '1 மணிநேரம், 1 நிமிடம், 1 விநாடி');
+        test.equal(clockformatted_1[0], '1 மணிநேரம், 1 நிமிடம் மற்றும் 1 விநாடி');
         test.equal(clockformatted_1[1], '1 மணிநேரம், 1 நிமிடம், 1 விநாடி');
         test.equal(clockformatted_1[2], '1 ம.நே. 1 நிமி. 1 வி.');
         test.equal(clockformatted_1[3], '1 ம.நே. 1 நிமி. 1 வி.');
-    
-        test.equal(clockformatted_2[0], '2 மணிநேரங்கள், 2 நிமிடங்கள், 2 விநாடிகள்');
+
+        test.equal(clockformatted_2[0], '2 மணிநேரங்கள், 2 நிமிடங்கள் மற்றும் 2 விநாடிகள்');
         test.equal(clockformatted_2[1], '2 மணிநேரம், 2 நிமிட, 2 விநாடிகள்');
         test.equal(clockformatted_2[2], '2 ம.நே. 2 நிமி. 2 வி.');
         test.equal(clockformatted_2[3], '2 ம.நே. 2 நிமி. 2 வி.');
@@ -5251,7 +5251,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 సం., 1 నె., 1 వా., 1 రోజు');
         test.equal(textformatted_1[2], '1సం, 1నె, 1వా, 1రో');
         test.equal(textformatted_1[3], '1సం, 1నె, 1వా, 1రో');
-    
+
         test.equal(textformatted_16[0], '16 సంవత్సరాలు, 16 నెలలు, 16 వారాలు, 16 రోజులు');
         test.equal(textformatted_16[1], '16 సం., 16 నె., 16 వా., 16 రోజులు');
         test.equal(textformatted_16[2], '16సం, 16నె, 16వా, 16రో');
@@ -5261,7 +5261,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 గం., 1 నిమి., 1 సె.');
         test.equal(clockformatted_1[2], '1గం, 1ని, 1సె');
         test.equal(clockformatted_1[3], '1గం, 1ని, 1సె');
-    
+
         test.equal(clockformatted_16[0], '16 గంటలు, 16 నిమిషాలు, 16 సెకన్లు');
         test.equal(clockformatted_16[1], '16 గం., 16 నిమి., 16 సెక.');
         test.equal(clockformatted_16[2], '16గం, 16ని, 16సె');
@@ -5293,7 +5293,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 ปี 1 เดือน 1 สัปดาห์ 1 วัน');
         test.equal(textformatted_1[2], '1ปี 1เดือน 1สัปดาห์ 1วัน');
         test.equal(textformatted_1[3], '1ปี 1เดือน 1สัปดาห์ 1วัน');
-    
+
         test.equal(textformatted_16[0], '16 ปี 16 เดือน 16 สัปดาห์ และ 16 วัน');
         test.equal(textformatted_16[1], '16 ปี 16 เดือน 16 สัปดาห์ 16 วัน');
         test.equal(textformatted_16[2], '16ปี 16เดือน 16สัปดาห์ 16วัน');
@@ -5303,7 +5303,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ชม. 1 นาที 1 วิ');
         test.equal(clockformatted_1[2], '1ชม. 1นาที 1วิ');
         test.equal(clockformatted_1[3], '1ชม. 1นาที 1วิ');
-    
+
         test.equal(clockformatted_16[0], '16 ชั่วโมง 16 นาที และ 16 วินาที');
         test.equal(clockformatted_16[1], '16 ชม. 16 นาที 16 วิ');
         test.equal(clockformatted_16[2], '16ชม. 16นาที 16วิ');
@@ -5335,7 +5335,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yıl 1 ay 1 hf. 1 gün');
         test.equal(textformatted_1[2], '1y 1a 1h 1g');
         test.equal(textformatted_1[3], '1y 1a 1h 1g');
-    
+
         test.equal(textformatted_2[0], '2 yıl 2 ay 2 hafta 2 gün');
         test.equal(textformatted_2[1], '2 yıl 2 ay 2 hf. 2 gün');
         test.equal(textformatted_2[2], '2y 2a 2h 2g');
@@ -5345,7 +5345,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 sa. 1 dk. 1 sn.');
         test.equal(clockformatted_1[2], '1 sa 1d 1sn');
         test.equal(clockformatted_1[3], '1 sa 1d 1sn');
-    
+
         test.equal(clockformatted_2[0], '2 saat 2 dakika 2 saniye');
         test.equal(clockformatted_2[1], '2 sa. 2 dk. 2 sn.');
         test.equal(clockformatted_2[2], '2s 2d 2sn');
@@ -5377,7 +5377,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yıl 1 ay 1 hf. 1 gün');
         test.equal(textformatted_1[2], '1y 1a 1h 1g');
         test.equal(textformatted_1[3], '1y 1a 1h 1g');
-    
+
         test.equal(textformatted_16[0], '16 yıl 16 ay 16 hafta 16 gün');
         test.equal(textformatted_16[1], '16 yıl 16 ay 16 hf. 16 gün');
         test.equal(textformatted_16[2], '16y 16a 16h 16g');
@@ -5387,7 +5387,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 sa. 1 dk. 1 sn.');
         test.equal(clockformatted_1[2], '1 sa 1d 1sn');
         test.equal(clockformatted_1[3], '1 sa 1d 1sn');
-    
+
         test.equal(clockformatted_16[0], '16 saat 16 dakika 16 saniye');
         test.equal(clockformatted_16[1], '16 sa. 16 dk. 16 sn.');
         test.equal(clockformatted_16[2], '16s 16d 16sn');
@@ -5419,7 +5419,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yıl 1 ay 1 hf. 1 gün');
         test.equal(textformatted_1[2], '1y 1a 1h 1g');
         test.equal(textformatted_1[3], '1y 1a 1h 1g');
-    
+
         test.equal(textformatted_17[0], '17 yıl 17 ay 17 hafta 17 gün');
         test.equal(textformatted_17[1], '17 yıl 17 ay 17 hf. 17 gün');
         test.equal(textformatted_17[2], '17y 17a 17h 17g');
@@ -5429,7 +5429,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 sa. 1 dk. 1 sn.');
         test.equal(clockformatted_1[2], '1 sa 1d 1sn');
         test.equal(clockformatted_1[3], '1 sa 1d 1sn');
-    
+
         test.equal(clockformatted_17[0], '17 saat 17 dakika 17 saniye');
         test.equal(clockformatted_17[1], '17 sa. 17 dk. 17 sn.');
         test.equal(clockformatted_17[2], '17s 17d 17sn');
@@ -5461,7 +5461,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yıl 1 ay 1 hf. 1 gün');
         test.equal(textformatted_1[2], '1y 1a 1h 1g');
         test.equal(textformatted_1[3], '1y 1a 1h 1g');
-    
+
         test.equal(textformatted_2[0], '2 yıl 2 ay 2 hafta 2 gün');
         test.equal(textformatted_2[1], '2 yıl 2 ay 2 hf. 2 gün');
         test.equal(textformatted_2[2], '2y 2a 2h 2g');
@@ -5471,7 +5471,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 sa. 1 dk. 1 sn.');
         test.equal(clockformatted_1[2], '1 sa 1d 1sn');
         test.equal(clockformatted_1[3], '1 sa 1d 1sn');
-    
+
         test.equal(clockformatted_2[0], '2 saat 2 dakika 2 saniye');
         test.equal(clockformatted_2[1], '2 sa. 2 dk. 2 sn.');
         test.equal(clockformatted_2[2], '2s 2d 2sn');
@@ -5520,7 +5520,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 год, 1 хв, 1 с');
         test.equal(clockformatted_1[2], '1 год, 1 хв, 1 с');
         test.equal(clockformatted_1[3], '1 год, 1 хв, 1 с');
-    
+
         test.equal(clockformatted_2[0], '2 години, 2 хвилини і 2 секунди');
         test.equal(clockformatted_2[1], '2 год, 2 хв, 2 с');
         test.equal(clockformatted_2[2], '2 год, 2 хв, 2 с');
@@ -5557,7 +5557,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '‏1 سال، 1 مہینہ، 1 ہفتہ، 1 دن');
         test.equal(textformatted_1[2], '‏1 سال 1 مہینہ 1 ہفتہ 1 دن');
         test.equal(textformatted_1[3], '‏1 سال 1 مہینہ 1 ہفتہ 1 دن');
-    
+
         test.equal(textformatted_2[0], '‏2 سال, 2 مہینے, 2 ہفتے، 2 دن');
         test.equal(textformatted_2[1], '‏2 سال، 2 مہینے، 2 ہفتے، 2 دن');
         test.equal(textformatted_2[2], '‏2 سال 2 مہینے 2 ہفتے 2 دن');
@@ -5567,7 +5567,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '‏1 گھنٹہ، 1 منٹ، 1 سیکنڈ');
         test.equal(clockformatted_1[2], '‏1 گھنٹہ 1 منٹ 1 سیکنڈ');
         test.equal(clockformatted_1[3], '‏1 گھنٹہ 1 منٹ 1 سیکنڈ');
-    
+
         test.equal(clockformatted_2[0], '‏2 گھنٹے, 2 منٹ، 2 سیکنڈ');
         test.equal(clockformatted_2[1], '‏2 گھنٹے، 2 منٹ، 2 سیکنڈ');
         test.equal(clockformatted_2[2], '‏2 گھنٹے 2 منٹ 2 سیکنڈ'); // CLDR 34 change (second)
@@ -5599,7 +5599,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yil 1 oy 1 hafta 1 kun');
         test.equal(textformatted_1[2], '1 yil 1 oy 1 hafta 1 kun');
         test.equal(textformatted_1[3], '1 yil 1 oy 1 hafta 1 kun');
-    
+
         test.equal(textformatted_2[0], '2 yil 2 oy 2 hafta 2 kun');
         test.equal(textformatted_2[1], '2 yil 2 oy 2 hafta 2 kun');
         test.equal(textformatted_2[2], '2 yil 2 oy 2 hafta 2 kun');
@@ -5609,7 +5609,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 soat 1 daq. 1 son.');
         test.equal(clockformatted_1[2], '1 soat 1 daq. 1 s');
         test.equal(clockformatted_1[3], '1 soat 1 daq. 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 soat 2 daqiqa 2 soniya');
         test.equal(clockformatted_2[1], '2 soat 2 daq. 2 son.');
         test.equal(clockformatted_2[2], '2 soat 2 daq. 2 s');
@@ -5637,22 +5637,22 @@ module.exports.testdurfmt2 = {
             clockformatted_2.push(textfmt.format({hour: 2,minute: 2,second: 2}).toString());
         }
 
-        test.equal(textformatted_1[0], '1 năm, 1 tháng, 1 tuần, 1 ngày');
+        test.equal(textformatted_1[0], '1 năm, 1 tháng, 1 tuần và 1 ngày');
         test.equal(textformatted_1[1], '1 năm, 1 tháng, 1 tuần, 1 ngày');
         test.equal(textformatted_1[2], '1 năm, 1 tháng, 1 tuần, 1 ngày');
         test.equal(textformatted_1[3], '1 năm 1 tháng 1 tuần 1 ngày');
-    
-        test.equal(textformatted_2[0], '2 năm, 2 tháng, 2 tuần, 2 ngày');
+
+        test.equal(textformatted_2[0], '2 năm, 2 tháng, 2 tuần và 2 ngày');
         test.equal(textformatted_2[1], '2 năm, 2 tháng, 2 tuần, 2 ngày');
         test.equal(textformatted_2[2], '2 năm, 2 tháng, 2 tuần, 2 ngày');
         test.equal(textformatted_2[3], '2 năm 2 tháng 2 tuần 2 ngày');
 
-        test.equal(clockformatted_1[0], '1 giờ, 1 phút, 1 giây');
+        test.equal(clockformatted_1[0], '1 giờ, 1 phút và 1 giây');
         test.equal(clockformatted_1[1], '1 giờ, 1 phút, 1 giây');
         test.equal(clockformatted_1[2], '1 giờ, 1 phút, 1 giây');
         test.equal(clockformatted_1[3], '1 giờ 1 phút 1 giây');
-    
-        test.equal(clockformatted_2[0], '2 giờ, 2 phút, 2 giây');
+
+        test.equal(clockformatted_2[0], '2 giờ, 2 phút và 2 giây');
         test.equal(clockformatted_2[1], '2 giờ, 2 phút, 2 giây');
         test.equal(clockformatted_2[2], '2 giờ, 2 phút, 2 giây');
         test.equal(clockformatted_2[3], '2 giờ 2 phút 2 giây');
@@ -5703,12 +5703,12 @@ module.exports.testdurfmt2 = {
             textformatted_2.push(textfmt.format({year: 2,month: 2,week: 2,day: 2}).toString());
             clockformatted_2.push(textfmt.format({hour: 2,minute: 2,second: 2}).toString());
         }
-    
+
         test.equal(textformatted_2[0], '2 年 2 個月 2 星期 2 日');
         test.equal(textformatted_2[1], '2 年 2 個月 2 星期 2 日');
         test.equal(textformatted_2[2], '2年2個月2週2日');
         test.equal(textformatted_2[3], '2年2個月2週2日');
-    
+
         test.equal(clockformatted_2[0], '2 小時 2 分鐘 2 秒');
         test.equal(clockformatted_2[1], '2 小時 2 分鐘 2 秒');
         test.equal(clockformatted_2[2], '2小時2分2秒');
@@ -5767,7 +5767,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -5777,7 +5777,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -5808,7 +5808,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -5818,7 +5818,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -5849,7 +5849,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -5859,7 +5859,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -5890,7 +5890,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -5900,7 +5900,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -5928,25 +5928,25 @@ module.exports.testdurfmt2 = {
             clockformatted_2.push(textfmt.format({hour: 2,minute: 2,second: 2}).toString());
         }
 
-        test.equal(textformatted_1[0], '1 жил, 1 сар, 1 долоо хоног, 1 өдөр');
-        test.equal(textformatted_1[1], '1 жил, 1 сар, 1 дол/хон, 1 өдөр');
-        test.equal(textformatted_1[2], '1 жил, 1 сар, 1 д/х, 1 өдөр');
-        test.equal(textformatted_1[3], '1 жил, 1 сар, 1 д/х, 1 өдөр');
-    
-        test.equal(textformatted_2[0], '2 жил, 2 сар, 2 долоо хоног, 2 өдөр');
-        test.equal(textformatted_2[1], '2 жил, 2 сар, 2 дол/хон, 2 өдөр');
-        test.equal(textformatted_2[2], '2 жил, 2 сар, 2 д/х, 2 өдөр');
-        test.equal(textformatted_2[3], '2 жил, 2 сар, 2 д/х, 2 өдөр');
-        
-        test.equal(clockformatted_1[0], '1 цаг, 1 минут, 1 секунд');
-        test.equal(clockformatted_1[1], '1 цаг, 1 мин, 1 сек');
-        test.equal(clockformatted_1[2], '1 ц, 1 мин, 1 сек');
-        test.equal(clockformatted_1[3], '1 ц, 1 мин, 1 сек');
-    
-        test.equal(clockformatted_2[0], '2 цаг, 2 минут, 2 секунд');
-        test.equal(clockformatted_2[1], '2 цаг, 2 мин, 2 сек');
-        test.equal(clockformatted_2[2], '2 ц, 2 мин, 2 сек');
-        test.equal(clockformatted_2[3], '2 ц, 2 мин, 2 сек');
+        test.equal(textformatted_1[0], '1 жил 1 сар 1 долоо хоног 1 хоног');
+        test.equal(textformatted_1[1], '1 жил 1 сар 1 д.х 1 хоног');
+        test.equal(textformatted_1[2], '1ж 1с 1 д.х 1 хоног');
+        test.equal(textformatted_1[3], '1ж 1с 1 д.х 1 хоног');
+
+        test.equal(textformatted_2[0], '2 жил 2 сар 2 долоо хоног 2 хоног');
+        test.equal(textformatted_2[1], '2 жил 2 сар 2 д.х 2 хоног');
+        test.equal(textformatted_2[2], '2ж 2с 2 д.х 2 хоног');
+        test.equal(textformatted_2[3], '2ж 2с 2 д.х 2 хоног');
+
+        test.equal(clockformatted_1[0], '1 цаг 1 минут 1 секунд');
+        test.equal(clockformatted_1[1], '1 цаг 1 мин 1 сек');
+        test.equal(clockformatted_1[2], '1 ц 1 мин 1 сек');
+        test.equal(clockformatted_1[3], '1 ц 1 мин 1 сек');
+
+        test.equal(clockformatted_2[0], '2 цаг 2 минут 2 секунд');
+        test.equal(clockformatted_2[1], '2 цаг 2 мин 2 сек');
+        test.equal(clockformatted_2[2], '2 ц 2 мин 2 сек');
+        test.equal(clockformatted_2[3], '2 ц 2 мин 2 сек');
 
         test.done();
     },
@@ -5971,23 +5971,23 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 año, 1 mes, 1 semana y 1 día');
         test.equal(textformatted_1[1], '1 a, 1 m., 1 sem., 1 d');
-        test.equal(textformatted_1[2], '1a, 1m, 1sem, 1d');
-        test.equal(textformatted_1[3], '1a 1m 1sem 1d');
-    
+        test.equal(textformatted_1[2], '1 a, 1 m., 1 sem., 1 d');
+        test.equal(textformatted_1[3], '1 a 1 m. 1 sem. 1 d');
+
         test.equal(textformatted_17[0], '17 años, 17 meses, 17 semanas y 17 días');
         test.equal(textformatted_17[1], '17 a, 17 m., 17 sem., 17 d');
-        test.equal(textformatted_17[2], '17a, 17m, 17sem, 17d');
-        test.equal(textformatted_17[3], '17a 17m 17sem 17d');
+        test.equal(textformatted_17[2], '17 a, 17 m., 17 sem., 17 d');
+        test.equal(textformatted_17[3], '17 a 17 m. 17 sem. 17 d');
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
+        test.equal(clockformatted_1[3], '1 h 1 min 1 s');
+
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17min, 17s');
-        test.equal(clockformatted_17[3], '17h 17min 17s');
+        test.equal(clockformatted_17[2], '17 h, 17 min, 17 s');
+        test.equal(clockformatted_17[3], '17 h 17 min 17 s');
 
         test.done();
     },
@@ -6015,21 +6015,21 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 j., 1 md., 1 w., 1 dag');
         test.equal(textformatted_1[2], '1 j., 1 md., 1 w., 1 d.');
         test.equal(textformatted_1[3], '1 j., 1 md., 1 w., 1 d.');
-    
+
         test.equal(textformatted_2[0], '2 jaar, 2 maande, 2 weke en 2 dae');
         test.equal(textformatted_2[1], '2 j., 2 md., 2 w., 2 dae');
         test.equal(textformatted_2[2], '2 j., 2 md., 2 w., 2 d.');
         test.equal(textformatted_2[3], '2 j., 2 md., 2 w., 2 d.');
 
         test.equal(clockformatted_1[0], '1 uur, 1 minuut en 1 sekonde');
-        test.equal(clockformatted_1[1], '1 u., 1 min., 1 sek.');
-        test.equal(clockformatted_1[2], '1 u., 1 min., 1 sek.');
-        test.equal(clockformatted_1[3], '1 u., 1 min., 1 sek.');
-    
+        test.equal(clockformatted_1[1], '1 u., 1 min., 1 s.');
+        test.equal(clockformatted_1[2], '1 u., 1 min., 1 s.');
+        test.equal(clockformatted_1[3], '1 u., 1 min., 1 s.');
+
         test.equal(clockformatted_2[0], '2 uur, 2 minute en 2 sekondes');
-        test.equal(clockformatted_2[1], '2 u., 2 min., 2 sek.');
-        test.equal(clockformatted_2[2], '2 u., 2 min., 2 sek.');
-        test.equal(clockformatted_2[3], '2 u., 2 min., 2 sek.');
+        test.equal(clockformatted_2[1], '2 u., 2 min., 2 s.');
+        test.equal(clockformatted_2[2], '2 u., 2 min., 2 s.');
+        test.equal(clockformatted_2[3], '2 u., 2 min., 2 s.');
 
         test.done();
     },
@@ -6057,7 +6057,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 ዓመት፣ 1 ወራት፣ 1 ሳምንት፣ 1 ቀናት');
         test.equal(textformatted_1[2], '1 ዓመት፣ 1 ወር፣ 1 ሳምንት፣ 1 ቀ');
         test.equal(textformatted_1[3], '1 ዓመት፣ 1 ወር፣ 1 ሳምንት፣ 1 ቀ');
-    
+
         test.equal(textformatted_18[0], '18 ዓመታት፣ 18 ወራት፣ 18 ሳምንታት፣ 18 ቀናት');
         test.equal(textformatted_18[1], '18 ዓመታት፣ 18 ወራት፣ 18 ሳምንታት፣ 18 ቀናት');
         test.equal(textformatted_18[2], '18 ዓ፣ 18 ወር፣ 18 ሳምንት፣ 18 ቀ');
@@ -6067,7 +6067,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ሰዓ፣ 1 ደቂ፣ 1 ሰከ');
         test.equal(clockformatted_1[2], '1 ሰ፣ 1 ደ፣ 1 ሰ');
         test.equal(clockformatted_1[3], '1 ሰ፣ 1 ደ፣ 1 ሰ');
-    
+
         test.equal(clockformatted_18[0], '18 ሰዓቶች፣ 18 ደቂቃዎች፣ 18 ሰከንዶች');
         test.equal(clockformatted_18[1], '18 ሰዓ፣ 18 ደቂቃ፣ 18 ሰከ');
         test.equal(clockformatted_18[2], '18 ሰ፣ 18 ደ፣ 18 ሰ');
@@ -6099,7 +6099,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 y, 1 m, 1 w, 1 d');
         test.equal(textformatted_1[2], '1 y, 1 m, 1 w, 1 d');
         test.equal(textformatted_1[3], '1 y, 1 m, 1 w, 1 d');
-    
+
         test.equal(textformatted_2[0], '2 y, 2 m, 2 w, 2 d');
         test.equal(textformatted_2[1], '2 y, 2 m, 2 w, 2 d');
         test.equal(textformatted_2[2], '2 y, 2 m, 2 w, 2 d');
@@ -6109,7 +6109,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 h, 1 min, 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 h, 2 min, 2 s');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
         test.equal(clockformatted_2[2], '2 h, 2 min, 2 s');
@@ -6143,7 +6143,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 ବର୍ଷ, 1 ମାସ, 1 ସପ୍ତାହ, 1 ଦିନ');
         test.equal(textformatted_1[2], '1ବର୍ଷ 1ମାସ 1ସପ୍ 1ଦିନ');
         test.equal(textformatted_1[3], '1ବର୍ଷ 1ମାସ 1ସପ୍ 1ଦିନ');
-    
+
         test.equal(textformatted_17[0], '17 ବର୍ଷ, 17 ମାସ, 17 ସପ୍ତାହ, 17 ଦିନ');
         test.equal(textformatted_17[1], '17 ବର୍ଷ, 17 ମାସ, 17 ସପ୍ତାହ, 17 ଦିନ');
         test.equal(textformatted_17[2], '17ବର୍ଷ 17ମାସ 17 ସପ୍ 17ଦିନ');
@@ -6153,7 +6153,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 ଘଣ୍ଟା, 1 ମିନିଟ୍‌, 1 ସେକେଣ୍ଡ');
         test.equal(clockformatted_1[2], '1ଘଣ୍ଟା 1ମିନିଟ୍‌ 1ସେକ୍');
         test.equal(clockformatted_1[3], '1ଘଣ୍ଟା 1ମିନିଟ୍‌ 1ସେକ୍');
-    
+
         test.equal(clockformatted_17[0], '17 ଘଣ୍ଟା, 17 ମିନିଟ୍, 17 ସେକେଣ୍ଡ');
         test.equal(clockformatted_17[1], '17 ଘଣ୍ଟା, 17 ମିନିଟ୍‌, 17 ସେକେଣ୍ଡ');
         test.equal(clockformatted_17[2], '17ଘଣ୍ଟା 17ମିନିଟ୍‌ 17ସେକ୍');
@@ -6185,7 +6185,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 il, 1 ay, 1 hft, 1 gün');
         test.equal(textformatted_1[2], '1 il, 1 ay, 1 hft, 1 gün');
         test.equal(textformatted_1[3], '1 il, 1 ay, 1 hft, 1 gün');
-    
+
         test.equal(textformatted_19[0], '19 il, 19 ay, 19 həftə, 19 gün');
         test.equal(textformatted_19[1], '19 il, 19 ay, 19 hft, 19 gün');
         test.equal(textformatted_19[2], '19 il, 19 ay, 19 hft, 19 gün');
@@ -6195,7 +6195,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 saat, 1 dəq, 1 san');
         test.equal(clockformatted_1[2], '1 saat, 1 dəq, 1 san');
         test.equal(clockformatted_1[3], '1 saat, 1 dəq, 1 san');
-    
+
         test.equal(clockformatted_19[0], '19 saat, 19 dəqiqə, 19 saniyə');
         test.equal(clockformatted_19[1], '19 saat, 19 dəq, 19 san');
         test.equal(clockformatted_19[2], '19 saat, 19 dəq, 19 san');
@@ -6227,7 +6227,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 ឆ្នាំ 1 ខែ 1 សប្ដាហ៍ 1 ថ្ងៃ');
         test.equal(textformatted_1[2], '1 ឆ្នាំ 1 ខែ 1 សប្ដាហ៍ 1 ថ្ងៃ');
         test.equal(textformatted_1[3], '1 ឆ្នាំ 1 ខែ 1 សប្ដាហ៍ 1 ថ្ងៃ');
-    
+
         test.equal(textformatted_23[0], '23 ឆ្នាំ 23 ខែ 23 សប្ដាហ៍ 23 ថ្ងៃ');
         test.equal(textformatted_23[1], '23 ឆ្នាំ 23 ខែ 23 សប្ដាហ៍ 23 ថ្ងៃ');
         test.equal(textformatted_23[2], '23 ឆ្នាំ 23 ខែ 23 សប្ដាហ៍ 23 ថ្ងៃ');
@@ -6266,7 +6266,7 @@ module.exports.testdurfmt2 = {
             clockformatted_2.push(textfmt.format({hour: 2,minute: 2,second: 2}).toString());
         }
 
-        test.equal(textformatted_1[0], 'වසර 1, මාස 1, සති 1, සහ දින 1');                                     
+        test.equal(textformatted_1[0], 'වසර 1, මාස 1, සති 1, සහ දින 1');
         test.equal(textformatted_1[1], 'වසර 1, මාස 1, සති 1, දින 1');
         test.equal(textformatted_1[2], 'ව 1, මා 1, ස 1, දි 1');
         test.equal(textformatted_1[3], 'ව 1, මා 1, ස 1, දි 1');
@@ -6315,53 +6315,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -6393,53 +6393,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -6471,53 +6471,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
 
         test.done();
@@ -6550,60 +6550,60 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
 
         test.done();
     },
     testDurFmt_ar_JO: function(test) {
         test.expect(40);
-        
+
         var textfmt;
         var data = setVariable();
         var length = data["fullLength"];
@@ -6629,53 +6629,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -6707,53 +6707,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
 
         test.done();
@@ -6786,53 +6786,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
 
         test.done();
@@ -6865,53 +6865,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -6943,53 +6943,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7021,53 +7021,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7099,53 +7099,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7176,54 +7176,54 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
-        test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[1], '‏سنة، وشهر، وأسبوع، ويوم');
+        test.equal(textformatted_1[2], '‏سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏سنتان وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏سنتان وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنوات و3 أشهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنوات و3 أشهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهرًا و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهرًا و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
-        test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
+        test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوانٍ');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7255,53 +7255,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7333,53 +7333,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7411,53 +7411,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7489,53 +7489,53 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '‏سنة، وشهر، وأسبوع، ويوم' );
         test.equal(textformatted_1[1], '‏سنة واحدة، وشهر، وأسبوع، ويوم');
-        test.equal(textformatted_1[2], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-        test.equal(textformatted_1[3], '‏1 سنة، 1 شهر، 1 أ، 1 ي');
-    
+        test.equal(textformatted_1[2], '‏1 سنة وشهر و1 أ و1 ي');
+        test.equal(textformatted_1[3], '‏1 سنة وشهر و1 أ و1 ي');
+
         test.equal(textformatted_2[0], '‏سنتان، وشهران، وأسبوعان، ويومان');
-        test.equal(textformatted_2[1], '‏سنتان، و2 شهر، وأسبوعان، ويومان');
-        test.equal(textformatted_2[2], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
-        test.equal(textformatted_2[3], '‏2 سنة، 2 شهر، 2 أ، 2 ي');
+        test.equal(textformatted_2[1], '‏سنتان، وشهران، وأسبوعان، ويومان');
+        test.equal(textformatted_2[2], '‏2 سنة وشهران و2 أ و2 ي');
+        test.equal(textformatted_2[3], '‏2 سنة وشهران و2 أ و2 ي');
 
         test.equal(textformatted_3[0], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
-        test.equal(textformatted_3[1], '‏3 سنة، و3 شهر، و3 أسابيع، و3 يوم');
-        test.equal(textformatted_3[2], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
-        test.equal(textformatted_3[3], '‏3 سنة، 3 شهر، 3 أ، 3 ي');
+        test.equal(textformatted_3[1], '‏3 سنوات، و3 أشهر، و3 أسابيع، و3 أيام');
+        test.equal(textformatted_3[2], '‏3 سنة و3 شهر و3 أ و3 ي');
+        test.equal(textformatted_3[3], '‏3 سنة و3 شهر و3 أ و3 ي');
 
         test.equal(textformatted_11[0], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
-        test.equal(textformatted_11[1], '‏11 سنة، و11 شهر، و11 أسبوعًا، و11 يوم');
-        test.equal(textformatted_11[2], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
-        test.equal(textformatted_11[3], '‏11 سنة، 11 شهر، 11 أ، 11 ي');
+        test.equal(textformatted_11[1], '‏11 سنة، و11 شهرًا، و11 أسبوعًا، و11 يومًا');
+        test.equal(textformatted_11[2], '‏11 سنة و11 شهر و11 أ و11 ي');
+        test.equal(textformatted_11[3], '‏11 سنة و11 شهر و11 أ و11 ي');
 
         test.equal(textformatted_100[0], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
         test.equal(textformatted_100[1], '‏100 سنة، و100 شهر، و100 أسبوع، و100 يوم');
-        test.equal(textformatted_100[2], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
-        test.equal(textformatted_100[3], '‏100 سنة، 100 شهر، 100 أ، 100 ي');
+        test.equal(textformatted_100[2], '‏100 سنة و100 شهر و100 أ و100 ي');
+        test.equal(textformatted_100[3], '‏100 سنة و100 شهر و100 أ و100 ي');
 
         test.equal(clockformatted_1[0], '‏ساعة، ودقيقة، وثانية');
         test.equal(clockformatted_1[1], '‏1 س، و1 د، و1 ث');
-        test.equal(clockformatted_1[2], '‏1 س، 1 د، 1 ث');
-        test.equal(clockformatted_1[3], '‏1 س، 1 د، 1 ث');
-    
+        test.equal(clockformatted_1[2], '‏1 س و1 د و1 ث');
+        test.equal(clockformatted_1[3], '‏1 س و1 د و1 ث');
+
         test.equal(clockformatted_2[0], '‏ساعتان، ودقيقتان، وثانيتان');
         test.equal(clockformatted_2[1], '‏2 س، و2 د، و2 ث');
-        test.equal(clockformatted_2[2], '‏2 س، 2 د، 2 ث');
-        test.equal(clockformatted_2[3], '‏2 س، 2 د، 2 ث');
+        test.equal(clockformatted_2[2], '‏2 س و2 د و2 ث');
+        test.equal(clockformatted_2[3], '‏2 س و2 د و2 ث');
 
         test.equal(clockformatted_3[0], '‏3 ساعات، و3 دقائق، و3 ثوان');
         test.equal(clockformatted_3[1], '‏3 س، و3 د، و3 ث');
-        test.equal(clockformatted_3[2], '‏3 س، 3 د، 3 ث');
-        test.equal(clockformatted_3[3], '‏3 س، 3 د، 3 ث');
+        test.equal(clockformatted_3[2], '‏3 س و3 د و3 ث');
+        test.equal(clockformatted_3[3], '‏3 س و3 د و3 ث');
 
         test.equal(clockformatted_11[0], '‏11 ساعة، و11 دقيقة، و11 ثانية');
         test.equal(clockformatted_11[1], '‏11 س، و11 د، و11 ث');
-        test.equal(clockformatted_11[2], '‏11 س، 11 د، 11 ث');
-        test.equal(clockformatted_11[3], '‏11 س، 11 د، 11 ث');
+        test.equal(clockformatted_11[2], '‏11 س و11 د و11 ث');
+        test.equal(clockformatted_11[3], '‏11 س و11 د و11 ث');
 
         test.equal(clockformatted_100[0], '‏100 ساعة، و100 دقيقة، و100 ثانية');
         test.equal(clockformatted_100[1], '‏100 س، و100 د، و100 ث');
-        test.equal(clockformatted_100[2], '‏100 س، 100 د، 100 ث');
-        test.equal(clockformatted_100[3], '‏100 س، 100 د، 100 ث');
+        test.equal(clockformatted_100[2], '‏100 س و100 د و100 ث');
+        test.equal(clockformatted_100[3], '‏100 س و100 د و100 ث');
 
         test.done();
     },
@@ -7562,7 +7562,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7572,7 +7572,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hr, 2 min, 2 sec');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7604,7 +7604,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7614,7 +7614,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7645,7 +7645,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7655,7 +7655,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7686,7 +7686,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7696,7 +7696,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7727,7 +7727,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7737,7 +7737,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7768,7 +7768,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7778,7 +7778,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7809,7 +7809,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7819,7 +7819,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7850,7 +7850,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 yr, 1 mth, 1 wk, 1 day');
         test.equal(textformatted_1[2], '1y, 1m, 1w, 1d');
         test.equal(textformatted_1[3], '1y 1m 1w 1d');
-    
+
         test.equal(textformatted_2[0], '2 years, 2 months, 2 weeks, 2 days');
         test.equal(textformatted_2[1], '2 yrs, 2 mths, 2 wks, 2 days');
         test.equal(textformatted_2[2], '2y, 2m, 2w, 2d');
@@ -7860,7 +7860,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 hr, 1 min, 1 sec');
         test.equal(clockformatted_1[2], '1h, 1m, 1s');
         test.equal(clockformatted_1[3], '1h 1m 1s');
-    
+
         test.equal(clockformatted_2[0], '2 hours, 2 minutes, 2 seconds');
         test.equal(clockformatted_2[1], '2 hrs, 2 mins, 2 secs');
         test.equal(clockformatted_2[2], '2h, 2m, 2s');
@@ -7877,7 +7877,7 @@ module.exports.testdurfmt2 = {
 
         var textformatted_1 = [],textformatted_17 = [];
         var clockformatted_1 = [],clockformatted_17 = [];
-        
+
         for (var i=0; i<4; i++) {
             textfmt = new DurationFmt({locale: "es-CR", style:"text", length:length[i]});
             textformatted_1.push(textfmt.format({year: 1,month: 1,week: 1,day: 1}).toString());
@@ -7891,7 +7891,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 a., 1 m., 1 sem., 1 d.');
         test.equal(textformatted_1[2], '1a., 1m., 1sem., 1d.');
         test.equal(textformatted_1[3], '1a. 1m. 1sem. 1d.');
-    
+
         test.equal(textformatted_17[0], '17 años, 17 meses, 17 semanas y 17 días');
         test.equal(textformatted_17[1], '17 aa., 17 mm., 17 sems., 17 dd.');
         test.equal(textformatted_17[2], '17aa., 17mm., 17sems., 17dd.');
@@ -7899,13 +7899,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1 s');
+        test.equal(clockformatted_1[3], '1h 1min 1 s');
+
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17min, 17s');
-        test.equal(clockformatted_17[3], '17h 17min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17 s');
+        test.equal(clockformatted_17[3], '17h 17min 17 s');
 
         test.done();
     },
@@ -7929,24 +7929,24 @@ module.exports.testdurfmt2 = {
         }
 
         test.equal(textformatted_1[0], '1 año, 1 mes, 1 semana y 1 día');
-        test.equal(textformatted_1[1], '1 a, 1 m., 1 sem., 1 d' ); 
-         test.equal(textformatted_1[2], '1a, 1m, 1sem, 1d');
-        test.equal(textformatted_1[3], '1a 1m 1sem 1d');
-    
+        test.equal(textformatted_1[1], '1 a, 1 m., 1 sem., 1 d' );
+        test.equal(textformatted_1[2], '1 a, 1 m., 1 sem., 1 d');
+        test.equal(textformatted_1[3], '1 a 1 m. 1 sem. 1 d');
+
         test.equal(textformatted_2[0], '2 años, 2 meses, 2 semanas y 2 días');
         test.equal(textformatted_2[1], '2 a, 2 m., 2 sem., 2 d');
-        test.equal(textformatted_2[2], '2a, 2m, 2sem, 2d');
-        test.equal(textformatted_2[3], '2a 2m 2sem 2d');
+        test.equal(textformatted_2[2], '2 a, 2 m., 2 sem., 2 d');
+        test.equal(textformatted_2[3], '2 a 2 m. 2 sem. 2 d');
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
+        test.equal(clockformatted_1[3], '1 h 1 min 1 s');
+
         test.equal(clockformatted_2[0], '2 horas, 2 minutos y 2 segundos');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2min, 2s');
-        test.equal(clockformatted_2[3], '2h 2min 2s');
+        test.equal(clockformatted_2[2], '2 h, 2 min, 2 s');
+        test.equal(clockformatted_2[3], '2 h 2 min 2 s');
 
         test.done();
     },
@@ -7971,23 +7971,23 @@ module.exports.testdurfmt2 = {
 
         test.equal(textformatted_1[0], '1 año, 1 mes, 1 semana y 1 día');
         test.equal(textformatted_1[1], '1 a, 1 m., 1 sem., 1 d');
-        test.equal(textformatted_1[2], '1a, 1m, 1sem, 1d');
-        test.equal(textformatted_1[3], '1a 1m 1sem 1d');
-    
+        test.equal(textformatted_1[2], '1 a, 1 m., 1 sem., 1 d');
+        test.equal(textformatted_1[3], '1 a 1 m. 1 sem. 1 d');
+
         test.equal(textformatted_17[0], '17 años, 17 meses, 17 semanas y 17 días');
         test.equal(textformatted_17[1], '17 a, 17 m., 17 sem., 17 d');
-        test.equal(textformatted_17[2], '17a, 17m, 17sem, 17d');
-        test.equal(textformatted_17[3], '17a 17m 17sem 17d');
+        test.equal(textformatted_17[2], '17 a, 17 m., 17 sem., 17 d');
+        test.equal(textformatted_17[3], '17 a 17 m. 17 sem. 17 d');
 
         test.equal(clockformatted_1[0], '1 hora, 1 minuto y 1 segundo');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1min, 1s');
-        test.equal(clockformatted_1[3], '1h 1min 1s');
-    
+        test.equal(clockformatted_1[2], '1 h, 1 min, 1 s');
+        test.equal(clockformatted_1[3], '1 h 1 min 1 s');
+
         test.equal(clockformatted_17[0], '17 horas, 17 minutos y 17 segundos');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17min, 17s');
-        test.equal(clockformatted_17[3], '17h 17min 17s');
+        test.equal(clockformatted_17[2], '17 h, 17 min, 17 s');
+        test.equal(clockformatted_17[3], '17 h 17 min 17 s');
 
         test.done();
     },
@@ -8016,7 +8016,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_2[0], '2 ans, 2 mois, 2 semaines et 2 jours');
         test.equal(textformatted_2[1], '2 ans, 2 m., 2 sem., 2 j');
         test.equal(textformatted_2[2], '2a, 2m., 2sem., 2j');
@@ -8024,13 +8024,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8057,7 +8057,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_17[0], '17 ans, 17 mois, 17 semaines et 17 jours');
         test.equal(textformatted_17[1], '17 ans, 17 m., 17 sem., 17 j');
         test.equal(textformatted_17[2], '17a, 17m., 17sem., 17j');
@@ -8065,13 +8065,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17 min, 17s');
-        test.equal(clockformatted_17[3], '17h 17 min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -8099,7 +8099,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_17[0], '17 ans, 17 mois, 17 semaines et 17 jours');
         test.equal(textformatted_17[1], '17 ans, 17 m., 17 sem., 17 j');
         test.equal(textformatted_17[2], '17a, 17m., 17sem., 17j');
@@ -8107,13 +8107,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17 min, 17s');
-        test.equal(clockformatted_17[3], '17h 17 min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -8140,7 +8140,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_2[0], '2 ans, 2 mois, 2 semaines et 2 jours');
         test.equal(textformatted_2[1], '2 ans, 2 m., 2 sem., 2 j');
         test.equal(textformatted_2[2], '2a, 2m., 2sem., 2j');
@@ -8148,13 +8148,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8189,13 +8189,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 heures, 16 minutes et 16 secondes');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16 min, 16s');
-        test.equal(clockformatted_16[3], '16h 16 min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -8222,7 +8222,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_17[0], '17 ans, 17 mois, 17 semaines et 17 jours');
         test.equal(textformatted_17[1], '17 ans, 17 m., 17 sem., 17 j');
         test.equal(textformatted_17[2], '17a, 17m., 17sem., 17j');
@@ -8230,13 +8230,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17 min, 17s');
-        test.equal(clockformatted_17[3], '17h 17 min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -8271,13 +8271,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 heures, 16 minutes et 16 secondes');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16 min, 16s');
-        test.equal(clockformatted_16[3], '16h 16 min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -8290,7 +8290,7 @@ module.exports.testdurfmt2 = {
 
         var textformatted_1 = [],textformatted_16 = [];
         var clockformatted_1 = [],clockformatted_16 = [];
-        
+
         for (var i=0; i<4; i++) {
             textfmt = new DurationFmt({locale: "fr-GQ", style:"text", length:length[i]});
             textformatted_1.push(textfmt.format({year: 1,month: 1,week: 1,day: 1}).toString());
@@ -8312,13 +8312,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 heures, 16 minutes et 16 secondes');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16 min, 16s');
-        test.equal(clockformatted_16[3], '16h 16 min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -8345,7 +8345,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_2[0], '2 ans, 2 mois, 2 semaines et 2 jours');
         test.equal(textformatted_2[1], '2 ans, 2 m., 2 sem., 2 j');
         test.equal(textformatted_2[2], '2a, 2m., 2sem., 2j');
@@ -8353,13 +8353,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8386,7 +8386,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_2[0], '2 ans, 2 mois, 2 semaines et 2 jours');
         test.equal(textformatted_2[1], '2 ans, 2 m., 2 sem., 2 j');
         test.equal(textformatted_2[2], '2a, 2m., 2sem., 2j');
@@ -8394,13 +8394,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8435,13 +8435,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8476,13 +8476,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 heures, 16 minutes et 16 secondes');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16 min, 16s');
-        test.equal(clockformatted_16[3], '16h 16 min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -8517,13 +8517,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8550,7 +8550,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 an, 1 m., 1 sem., 1 j');
         test.equal(textformatted_1[2], '1a, 1m., 1sem., 1j');
         test.equal(textformatted_1[3], '1a 1m. 1sem. 1j');
-    
+
         test.equal(textformatted_17[0], '17 ans, 17 mois, 17 semaines et 17 jours');
         test.equal(textformatted_17[1], '17 ans, 17 m., 17 sem., 17 j');
         test.equal(textformatted_17[2], '17a, 17m., 17sem., 17j');
@@ -8558,13 +8558,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
-    
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
+
         test.equal(clockformatted_17[0], '17 heures, 17 minutes et 17 secondes');
         test.equal(clockformatted_17[1], '17 h, 17 min, 17 s');
-        test.equal(clockformatted_17[2], '17h, 17 min, 17s');
-        test.equal(clockformatted_17[3], '17h 17 min 17s');
+        test.equal(clockformatted_17[2], '17h, 17min, 17s');
+        test.equal(clockformatted_17[3], '17h 17min 17s');
 
         test.done();
     },
@@ -8599,13 +8599,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8640,13 +8640,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_16[0], '16 heures, 16 minutes et 16 secondes');
         test.equal(clockformatted_16[1], '16 h, 16 min, 16 s');
-        test.equal(clockformatted_16[2], '16h, 16 min, 16s');
-        test.equal(clockformatted_16[3], '16h 16 min 16s');
+        test.equal(clockformatted_16[2], '16h, 16min, 16s');
+        test.equal(clockformatted_16[3], '16h 16min 16s');
 
         test.done();
     },
@@ -8681,13 +8681,13 @@ module.exports.testdurfmt2 = {
 
         test.equal(clockformatted_1[0], '1 heure, 1 minute et 1 seconde');
         test.equal(clockformatted_1[1], '1 h, 1 min, 1 s');
-        test.equal(clockformatted_1[2], '1h, 1 min, 1s');
-        test.equal(clockformatted_1[3], '1h 1 min 1s');
+        test.equal(clockformatted_1[2], '1h, 1min, 1s');
+        test.equal(clockformatted_1[3], '1h 1min 1s');
 
         test.equal(clockformatted_2[0], '2 heures, 2 minutes et 2 secondes');
         test.equal(clockformatted_2[1], '2 h, 2 min, 2 s');
-        test.equal(clockformatted_2[2], '2h, 2 min, 2s');
-        test.equal(clockformatted_2[3], '2h 2 min 2s');
+        test.equal(clockformatted_2[2], '2h, 2min, 2s');
+        test.equal(clockformatted_2[3], '2h 2min 2s');
 
         test.done();
     },
@@ -8715,7 +8715,7 @@ module.exports.testdurfmt2 = {
         test.equal(textformatted_1[1], '1 thn, 1 bln, 1 mgu, 1 hari');
         test.equal(textformatted_1[2], '1 thn, 1 bln, 1 mgu, 1 h');
         test.equal(textformatted_1[3], '1 thn 1 bln 1 mgu 1 h');
-    
+
         test.equal(textformatted_2[0], '2 tahun, 2 bulan, 2 minggu, 2 hari');
         test.equal(textformatted_2[1], '2 thn, 2 bln, 2 mgu, 2 hari');
         test.equal(textformatted_2[2], '2 thn, 2 bln, 2 mgu, 2 h');
@@ -8725,7 +8725,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '1 j, 1 min, 1 saat');
         test.equal(clockformatted_1[2], '1 j, 1 min, 1 s');
         test.equal(clockformatted_1[3], '1 j 1 min 1 s');
-    
+
         test.equal(clockformatted_2[0], '2 jam, 2 minit, 2 saat');
         test.equal(clockformatted_2[1], '2 j, 2 min, 2 saat');
         test.equal(clockformatted_2[2], '2 j, 2 min, 2 s');
@@ -8767,12 +8767,12 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '‏1 h, 1 min, 1 s');
         test.equal(clockformatted_1[2], '‏1 h, 1 min, 1 s');
         test.equal(clockformatted_1[3], '‏1 h, 1 min, 1 s');
-    
+
         test.equal(clockformatted_18[0], '‏18 h, 18 min, 18 s');
         test.equal(clockformatted_18[1], '‏18 h, 18 min, 18 s');
         test.equal(clockformatted_18[2], '‏18 h, 18 min, 18 s');
         test.equal(clockformatted_18[3], '‏18 h, 18 min, 18 s');
-                                         
+
         test.done();
     },
     testDurFmt_pt_AO: function(test) {
@@ -8932,7 +8932,7 @@ module.exports.testdurfmt2 = {
         test.equal(clockformatted_1[1], '‏1 گھنٹہ، 1 منٹ، 1 سیکنڈ');
         test.equal(clockformatted_1[2], '‏1 گھنٹہ، 1 منٹ، 1 سیکنڈ'); // CLDR 34 change(second)
         test.equal(clockformatted_1[3], '‏1 گھنٹہ، 1 منٹ، 1 سیکنڈ'); // CLDR 34 change(second)
-                                        
+
         test.equal(clockformatted_17[0], '‏17 گھنٹے, 17 منٹ، اور 17 سیکنڈ');
         test.equal(clockformatted_17[1], '‏17 گھنٹے، 17 منٹ، 17 سیکنڈ');
         test.equal(clockformatted_17[2], '‏17 گھنٹے، 17 منٹ، 17 سیکنڈ'); // CLDR 34 change(second)
diff --git a/js/test/durfmt/testdurfmt_ar_SA.js b/js/test/durfmt/testdurfmt_ar_SA.js
index 39f3fce871..0c74aaebff 100644
--- a/js/test/durfmt/testdurfmt_ar_SA.js
+++ b/js/test/durfmt/testdurfmt_ar_SA.js
@@ -1,7 +1,7 @@
 /*
  * testdurfmt_ar_SA.js - test the duration formatter object
  *
- * Copyright © 2012-2015,2017, JEDLSoft
+ * Copyright © 2012-2020, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏١ سنة، ١ شهر، ١ أ، ١ ي، ١ س، ١ د، ١ ث");
+        test.equal(duration.toString(), "‏سنة وشهر و١ أ و١ ي و١ س و١ د و١ ث");
         test.done();
     },
 
@@ -71,7 +71,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏١ سنة، ١ شهر، ١ أ، ١ ي، ١ س، ١ د، ١ ث");
+        test.equal(duration.toString(), "‏سنة وشهر و١ أ و١ ي و١ س و١ د و١ ث");
         test.done();
     },
 
@@ -93,7 +93,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏١ سنة، ١ شهر، ١ أ، ١ ي، ‏١:٠١:٠١");
+        test.equal(duration.toString(), "‏سنة وشهر و١ أ و١ ي و‏١:٠١:٠١");
         test.done();
     },
 
@@ -114,7 +114,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏١ سنة، ١ شهر، ١ أ، ١ ي، ١ س، ١ د، ١ ث");
+        test.equal(duration.toString(), "‏سنة وشهر و١ أ و١ ي و١ س و١ د و١ ث");
         test.done();
     },
 
@@ -135,7 +135,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏سنة واحدة، وشهر، وأسبوع، ويوم، و١ س، و١ د، و١ ث");
+        test.equal(duration.toString(), "‏سنة، وشهر، وأسبوع، ويوم، و١ س، و١ د، و١ ث");
         test.done();
     },
 
@@ -177,7 +177,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 2,
             second: 2
         });
-        test.equal(duration.toString(), "‏٢ سنة، ٢ شهر، ٢ أ، ٢ ي، ٢ س، ٢ د، ٢ ث");
+        test.equal(duration.toString(), "‏سنتان وشهران و٢ أ و٢ ي و٢ س و٢ د و٢ ث");
         test.done();
     },
 
@@ -199,7 +199,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 2,
             second: 2
         });
-        test.equal(duration.toString(), "‏٢ سنة، ٢ شهر، ٢ أ، ٢ ي، ٢ س، ٢ د، ٢ ث");
+        test.equal(duration.toString(), "‏سنتان وشهران و٢ أ و٢ ي و٢ س و٢ د و٢ ث");
         test.done();
     },
 
@@ -221,7 +221,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 2,
             second: 2
         });
-        test.equal(duration.toString(), "‏٢ سنة، ٢ شهر، ٢ أ، ٢ ي، ‏٢:٠٢:٠٢");
+        test.equal(duration.toString(), "‏سنتان وشهران و٢ أ و٢ ي و‏٢:٠٢:٠٢");
         test.done();
     },
 
@@ -242,7 +242,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 2,
             second: 2
         });
-        test.equal(duration.toString(), "‏٢ سنة، ٢ شهر، ٢ أ، ٢ ي، ٢ س، ٢ د، ٢ ث");
+        test.equal(duration.toString(), "‏سنتان وشهران و٢ أ و٢ ي و٢ س و٢ د و٢ ث");
         test.done();
     },
 
@@ -263,7 +263,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 2,
             second: 2
         });
-        test.equal(duration.toString(), "‏سنتان، و٢ شهر، وأسبوعان، ويومان، و٢ س، و٢ د، و٢ ث");
+        test.equal(duration.toString(), "‏سنتان، وشهران، وأسبوعان، ويومان، و٢ س، و٢ د، و٢ ث");
         test.done();
     },
 
@@ -305,7 +305,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 3,
             second: 3
         });
-        test.equal(duration.toString(), "‏٣ سنة، ٣ شهر، ٣ أ، ٣ ي، ٣ س، ٣ د، ٣ ث");
+        test.equal(duration.toString(), "‏٣ سنوات و٣ أشهر و٣ أ و٣ ي و٣ س و٣ د و٣ ث");
         test.done();
     },
 
@@ -327,7 +327,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 3,
             second: 3
         });
-        test.equal(duration.toString(), "‏٣ سنة، ٣ شهر، ٣ أ، ٣ ي، ٣ س، ٣ د، ٣ ث");
+        test.equal(duration.toString(), "‏٣ سنوات و٣ أشهر و٣ أ و٣ ي و٣ س و٣ د و٣ ث");
         test.done();
     },
 
@@ -349,7 +349,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 3,
             second: 3
         });
-        test.equal(duration.toString(), "‏٣ سنة، ٣ شهر، ٣ أ، ٣ ي، ‏٣:٠٣:٠٣");
+        test.equal(duration.toString(), "‏٣ سنوات و٣ أشهر و٣ أ و٣ ي و‏٣:٠٣:٠٣");
         test.done();
     },
 
@@ -370,7 +370,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 3,
             second: 3
         });
-        test.equal(duration.toString(), "‏٣ سنة، ٣ شهر، ٣ أ، ٣ ي، ٣ س، ٣ د، ٣ ث");
+        test.equal(duration.toString(), "‏٣ سنوات و٣ أشهر و٣ أ و٣ ي و٣ س و٣ د و٣ ث");
         test.done();
     },
 
@@ -391,7 +391,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 3,
             second: 3
         });
-        test.equal(duration.toString(), "‏٣ سنة، و٣ شهر، و٣ أسابيع، و٣ يوم، و٣ س، و٣ د، و٣ ث");
+        test.equal(duration.toString(), "‏٣ سنوات، و٣ أشهر، و٣ أسابيع، و٣ أيام، و٣ س، و٣ د، و٣ ث");
         test.done();
     },
 
@@ -412,7 +412,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 3,
             second: 3
         });
-        test.equal(duration.toString(), "‏٣ سنوات، و٣ أشهر، و٣ أسابيع، و٣ أيام، و٣ ساعات، و٣ دقائق، و٣ ثوان");
+        test.equal(duration.toString(), "‏٣ سنوات، و٣ أشهر، و٣ أسابيع، و٣ أيام، و٣ ساعات، و٣ دقائق، و٣ ثوانٍ");
         test.done();
     },
 
@@ -433,7 +433,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 11,
             second: 11
         });
-        test.equal(duration.toString(), "‏١١ سنة، ١١ شهر، ١١ أ، ١١ ي، ١١ س، ١١ د، ١١ ث");
+        test.equal(duration.toString(), "‏١١ سنة و١١ شهرًا و١١ أ و١١ ي و١١ س و١١ د و١١ ث");
         test.done();
     },
 
@@ -455,7 +455,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 11,
             second: 11
         });
-        test.equal(duration.toString(), "‏١١ سنة، ١١ شهر، ١١ أ، ١١ ي، ١١ س، ١١ د، ١١ ث");
+        test.equal(duration.toString(), "‏١١ سنة و١١ شهرًا و١١ أ و١١ ي و١١ س و١١ د و١١ ث");
         test.done();
     },
 
@@ -477,7 +477,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 11,
             second: 11
         });
-        test.equal(duration.toString(), "‏١١ سنة، ١١ شهر، ١١ أ، ١١ ي، ‏١١:١١:١١");
+        test.equal(duration.toString(), "‏١١ سنة و١١ شهرًا و١١ أ و١١ ي و‏١١:١١:١١");
         test.done();
     },
 
@@ -498,7 +498,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 11,
             second: 11
         });
-        test.equal(duration.toString(), "‏١١ سنة، ١١ شهر، ١١ أ، ١١ ي، ١١ س، ١١ د، ١١ ث");
+        test.equal(duration.toString(), "‏١١ سنة و١١ شهرًا و١١ أ و١١ ي و١١ س و١١ د و١١ ث");
         test.done();
     },
 
@@ -519,7 +519,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 11,
             second: 11
         });
-        test.equal(duration.toString(), "‏١١ سنة، و١١ شهر، و١١ أسبوعًا، و١١ يوم، و١١ س، و١١ د، و١١ ث");
+        test.equal(duration.toString(), "‏١١ سنة، و١١ شهرًا، و١١ أسبوعًا، و١١ يومًا، و١١ س، و١١ د، و١١ ث");
         test.done();
     },
 
@@ -658,7 +658,7 @@ module.exports.testdurfmt_ar_SA = {
                     minute: 3,
                     second: 3
                 });
-                test.equal(duration.toString(), "‏٣ سنوات، و٣ أشهر، و٣ أسابيع، و٣ أيام، و٣ ساعات، و٣ دقائق، و٣ ثوان");
+                test.equal(duration.toString(), "‏٣ سنوات، و٣ أشهر، و٣ أسابيع، و٣ أيام، و٣ ساعات، و٣ دقائق، و٣ ثوانٍ");
                 test.done();
             }
         });
@@ -682,7 +682,7 @@ module.exports.testdurfmt_ar_SA = {
                     minute: 3,
                     second: 3
                 });
-                test.equal(duration.toString(), "‏٣ سنوات، و٣ أشهر، و٣ أسابيع، و٣ أيام، و٣ ساعات، و٣ دقائق، و٣ ثوان");
+                test.equal(duration.toString(), "‏٣ سنوات، و٣ أشهر، و٣ أسابيع، و٣ أيام، و٣ ساعات، و٣ دقائق، و٣ ثوانٍ");
                 test.done();
             }
         });
@@ -755,7 +755,7 @@ module.exports.testdurfmt_ar_SA = {
                     minute: 1,
                     second: 1
                 });
-                test.equal(duration.toString(), "‏١ سنة، ١ شهر، ١ أ، ١ ي، ‏١:٠١:٠١");
+                test.equal(duration.toString(), "‏سنة وشهر و١ أ و١ ي و‏١:٠١:٠١");
                 test.done();
             }
         });
@@ -781,7 +781,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏1 سنة، 1 شهر، 1 أ، 1 ي، 1 س، 1 د، 1 ث");
+        test.equal(duration.toString(), "‏سنة وشهر و1 أ و1 ي و1 س و1 د و1 ث");
         test.done();
     },
 
@@ -804,7 +804,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏1 سنة، 1 شهر، 1 أ، 1 ي، 1 س، 1 د، 1 ث");
+        test.equal(duration.toString(), "‏سنة وشهر و1 أ و1 ي و1 س و1 د و1 ث");
         test.done();
     },
 
@@ -827,7 +827,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏1 سنة، 1 شهر، 1 أ، 1 ي، ‏1:01:01");
+        test.equal(duration.toString(), "‏سنة وشهر و1 أ و1 ي و‏1:01:01");
         test.done();
     },
 
@@ -849,7 +849,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏1 سنة، 1 شهر، 1 أ، 1 ي، 1 س، 1 د، 1 ث");
+        test.equal(duration.toString(), "‏سنة وشهر و1 أ و1 ي و1 س و1 د و1 ث");
         test.done();
     },
 
@@ -871,7 +871,7 @@ module.exports.testdurfmt_ar_SA = {
             minute: 1,
             second: 1
         });
-        test.equal(duration.toString(), "‏سنة واحدة، وشهر، وأسبوع، ويوم، و1 س، و1 د، و1 ث");
+        test.equal(duration.toString(), "‏سنة، وشهر، وأسبوع، ويوم، و1 س، و1 د، و1 ث");
         test.done();
     },
 
@@ -968,7 +968,7 @@ module.exports.testdurfmt_ar_SA = {
                     minute: 1,
                     second: 1
                 });
-                test.equal(duration.toString(), "‏1 سنة، 1 شهر، 1 أ، 1 ي، ‏1:01:01");
+                test.equal(duration.toString(), "‏سنة وشهر و1 أ و1 ي و‏1:01:01");
                 test.done();
             }
         });
diff --git a/js/test/durfmt/testdurfmtasync.js b/js/test/durfmt/testdurfmtasync.js
index a8e63dd744..e7547b7df5 100644
--- a/js/test/durfmt/testdurfmtasync.js
+++ b/js/test/durfmt/testdurfmtasync.js
@@ -1,7 +1,7 @@
 /*
  * testdurfmtasync.js - test the duration formatter object
  *
- * Copyright © 2018, JEDLSoft
+ * Copyright © 2018-2020, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -156,7 +156,7 @@ module.exports.testdurfmtasync = {
                     second: 1,
                     millisecond: 1
                 });
-                test.equal(duration.toString(), "1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 s, 1 ms");
+                test.equal(duration.toString(), '1 J, 1 M, 1 W, 1 T, 1 Std., 1 Min., 1 Sek., 1 ms');
                 test.done();
             }
         });
diff --git a/tools/cldr/datefmts.js b/tools/cldr/datefmts.js
index c35062e5f5..49b8b9f54d 100644
--- a/tools/cldr/datefmts.js
+++ b/tools/cldr/datefmts.js
@@ -1,7 +1,7 @@
 /*
  * datefmts.js - auxillary tools used to generate the dateformats.json files
  *
- * Copyright © 2015-2018, JEDLSoft
+ * Copyright © 2015-2020, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -461,7 +461,7 @@ module.exports = {
             m = {},
             y = {};
 
-            for (i = 0; i < lengths.length; i++) {
+            for (var i = 0; i < lengths.length; i++) {
                 var len = lengths[i];
 
                 cldrFormats[len] = getDateFormat(cldrCalendar, len);
@@ -504,8 +504,8 @@ module.exports = {
 
             var w;
 
-            i = scanForChars(cldrFormats["full"], "Ec");
-            if (i > -1 && cldrFormats["full"].charAt(i) === "c") {
+            var weekFormatIndex = scanForChars(cldrFormats["full"], "Ec");
+            if (weekFormatIndex > -1 && cldrFormats["full"].charAt(weekFormatIndex) === "c") {
                 w = {
                     "full": "cccc",
                     "long": "ccc",
@@ -538,8 +538,8 @@ module.exports = {
                 longPlus = longPlus.replace(y["long"], y["full"]);
             }
             // console.log("Search for '" + longPlus + "' in '" + cldrFormats["full"] + "'\n");
-            i = cldrFormats["full"].indexOf(longPlus);
-            if (i > -1) {
+            var longIndex = cldrFormats["full"].indexOf(longPlus);
+            if (longIndex > -1 && weekFormatIndex !== -1) {
                 tmp = cldrFormats["full"].replace(longPlus, "{date}");
                 // console.log("tmp is " + tmp + "\n");
                 wTemplate = tmp;
@@ -560,21 +560,21 @@ module.exports = {
                     // console.log("language " + language + " E found before date. Using wtemplate " + wTemplate + "\n");
                 } else if (scanForChars(full, "E") > max) {
                     // scan backwards to find the last dmy char
-                    i = full.length-1;
+                    var iterator = full.length-1;
                     var skipMode = false;
-                    while (i > -1) {
-                        if (full.charAt(i) === "'") {
+                    while (iterator > -1) {
+                        if (full.charAt(iterator) === "'") {
                             skipMode = !skipMode;
                         } else if (!skipMode) {
-                            var c = full.charAt(i);
+                            var c = full.charAt(iterator);
                             if (c === 'd' || c === 'M' || c === 'y') {
                                 break;
                             }
                         }
-                        i--;
+                        iterator--;
                     }
-                    wTemplate = "{date}" + full.substring(i+1);
-                    longPlus = full.substring(0, i+1);
+                    wTemplate = "{date}" + full.substring(iterator+1);
+                    longPlus = full.substring(0, iterator+1);
                     // console.log("language " + language + " E found after date. Using wtemplate " + wTemplate + " and longPlus is " + longPlus + "\n");
                     //} else {
                     // the w is in the middle of the dmy... not sure what to do about that!
@@ -586,7 +586,10 @@ module.exports = {
             calendar.date.dmwy["f"] = rtlify(correctedYear(cldrFormats["full"]));
             calendar.date.dmy["f"] = rtlify(correctedYear(longPlus));
 
-            for (i = 1; i < lengths.length; i++) {
+            for (var i = 0; i < lengths.length; i++) {
+                if (i == 0 && weekFormatIndex > -1) {
+                    continue;
+                }
                 var len = lengths[i];
                 var lenAbbr = len.charAt(0);
                 tmp = wTemplate.replace(/\{date\}/, cldrFormats[len]);
@@ -599,7 +602,7 @@ module.exports = {
 
             var orders = {};
 
-            for (i = 0; i < lengths.length; i++) {
+            for (var i = 0; i < lengths.length; i++) {
                 var len = lengths[i];
                 var lenAbbr = len.charAt(0);
                 calendar.date.w[lenAbbr] = w[len];
@@ -2041,7 +2044,7 @@ module.exports = {
             // already the minimum, so we don't need to do anything
             return;
         }
-        
+
         console.log("Promoting " + totals[0].name + "/" + filename + " to " + parentName + "\n");
         // promote a child as the new root, dropping the current root
         group.data = group[totals[0].name].data;
@@ -2049,8 +2052,8 @@ module.exports = {
 
     pruneFormatsChild: function(parent, child) {
         console.log(".");
-        
-        // first recursively prune all the grandchildren before pruning the child or else the child 
+
+        // first recursively prune all the grandchildren before pruning the child or else the child
         // will be too sparse to prune the grandchildren
         for (var localebit in child) {
             if (localebit !== "und" && localebit !== "data") {
@@ -2099,7 +2102,7 @@ module.exports = {
         // don't write out empty files!
         if (contents !== "{}") {
             console.log(localeComponents.join("-") + " ");
-            
+
             makeDirs(dir);
             fs.writeFileSync(filename, JSON.stringify(group.data, undefined, 4), 'utf8');
         }