fix: millisecond calendar unit

tsvetomir · tsvetomir · commit 3a1b70c985a8 · 2022-07-07T16:37:08.000+03:00
diff --git a/locale-tests/locales/af-NA/all.js b/locale-tests/locales/af-NA/all.js
@@ -2169,8 +2169,8 @@ const data = {
             },
             millisecond: {
                 narrow: "ms.",
-                short: "ms",
-                wide: "millisekondes"
+                short: "ms.",
+                wide: "millisekonde"
             }
         }
     },
diff --git a/locale-tests/locales/af-NA/calendar.js b/locale-tests/locales/af-NA/calendar.js
@@ -466,8 +466,8 @@ const data = {
             },
             millisecond: {
                 narrow: "ms.",
-                short: "ms",
-                wide: "millisekondes"
+                short: "ms.",
+                wide: "millisekonde"
             }
         }
     },
diff --git a/locale-tests/locales/af/all.js b/locale-tests/locales/af/all.js
@@ -2168,8 +2168,8 @@ const data = {
             },
             millisecond: {
                 narrow: "ms.",
-                short: "ms",
-                wide: "millisekondes"
+                short: "ms.",
+                wide: "millisekonde"
             }
         }
     },
diff --git a/locale-tests/locales/af/calendar.js b/locale-tests/locales/af/calendar.js
@@ -465,8 +465,8 @@ const data = {
             },
             millisecond: {
                 narrow: "ms.",
-                short: "ms",
-                wide: "millisekondes"
+                short: "ms.",
+                wide: "millisekonde"
             }
         }
     },
diff --git a/locale-tests/locales/ast/all.js b/locale-tests/locales/ast/all.js
@@ -2416,7 +2416,7 @@ const data = {
             millisecond: {
                 narrow: "ms",
                 short: "ms",
-                wide: "milisegundos"
+                wide: "milisegundu"
             }
         }
     },
diff --git a/locale-tests/locales/ast/calendar.js b/locale-tests/locales/ast/calendar.js
@@ -435,7 +435,7 @@ const data = {
             millisecond: {
                 narrow: "ms",
                 short: "ms",
-                wide: "milisegundos"
+                wide: "milisegundu"
             }
         }
     },
diff --git a/locale-tests/locales/be-tarask/all.js b/locale-tests/locales/be-tarask/all.js
@@ -2465,7 +2465,7 @@ const data = {
             millisecond: {
                 narrow: "мс",
                 short: "мс",
-                wide: "мілісекунды"
+                wide: "мілісекунда"
             }
         }
     },
diff --git a/locale-tests/locales/be-tarask/calendar.js b/locale-tests/locales/be-tarask/calendar.js
@@ -441,7 +441,7 @@ const data = {
             millisecond: {
                 narrow: "мс",
                 short: "мс",
-                wide: "мілісекунды"
+                wide: "мілісекунда"
             }
         }
     },
diff --git a/locale-tests/locales/be/all.js b/locale-tests/locales/be/all.js
@@ -2464,7 +2464,7 @@ const data = {
             millisecond: {
                 narrow: "мс",
                 short: "мс",
-                wide: "мілісекунды"
+                wide: "мілісекунда"
             }
         }
     },
diff --git a/locale-tests/locales/be/calendar.js b/locale-tests/locales/be/calendar.js
@@ -440,7 +440,7 @@ const data = {
             millisecond: {
                 narrow: "мс",
                 short: "мс",
-                wide: "мілісекунды"
+                wide: "мілісекунда"
             }
         }
     },
diff --git a/locale-tests/locales/bg/all.js b/locale-tests/locales/bg/all.js
@@ -2326,7 +2326,7 @@ const data = {
             millisecond: {
                 narrow: "мсек",
                 short: "мсек",
-                wide: "милисекунди"
+                wide: "милисекунда"
             }
         }
     },
diff --git a/src/cldr/default-data.js b/src/cldr/default-data.js
@@ -566,7 +566,7 @@ const defaultData = {
                 millisecond: {
                     narrow: "ms",
                     short: "ms",
-                    wide: "milliseconds"
+                    wide: "millisecond"
                 }
             }
         }
diff --git a/src/cldr/load-units.js b/src/cldr/load-units.js
@@ -1,15 +1,17 @@
 const MILLISECOND = 'duration-millisecond';
-const UNIT_PATTERN = 'unitPattern-count-other';
+const UNIT_PATTERN_ONE = 'unitPattern-count-one';
+const UNIT_PATTERN_OTHER = 'unitPattern-count-other';
 const placeholderPattern = /\{0\}\s?/;
 
-function extractUnit(value) {
+function extractUnit(unit) {
+    const value = unit[UNIT_PATTERN_ONE] || unit[UNIT_PATTERN_OTHER];
     return value.replace(placeholderPattern, '');
 }
 
 export default function loadUnits(localeInfo, units) {
     localeInfo.calendar.dateFields.millisecond = {
-        narrow: extractUnit(units.narrow[MILLISECOND][UNIT_PATTERN]),
-        short: extractUnit(units.short[MILLISECOND][UNIT_PATTERN]),
-        wide: extractUnit(units.long[MILLISECOND][UNIT_PATTERN])
+        narrow: extractUnit(units.narrow[MILLISECOND]),
+        short: extractUnit(units.short[MILLISECOND]),
+        wide: extractUnit(units.long[MILLISECOND])
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -2169,8 +2169,8 @@ const data = {`
`2169`	`2169`	`},`
`2170`	`2170`	`millisecond: {`
`2171`	`2171`	`narrow: "ms.",`
`2172`		`- short: "ms",`
`2173`		`- wide: "millisekondes"`
	`2172`	`+ short: "ms.",`
	`2173`	`+ wide: "millisekonde"`
`2174`	`2174`	`}`
`2175`	`2175`	`}`
`2176`	`2176`	`},`
Original file line number	Diff line number	Diff line change
`@@ -466,8 +466,8 @@ const data = {`
`466`	`466`	`},`
`467`	`467`	`millisecond: {`
`468`	`468`	`narrow: "ms.",`
`469`		`- short: "ms",`
`470`		`- wide: "millisekondes"`
	`469`	`+ short: "ms.",`
	`470`	`+ wide: "millisekonde"`
`471`	`471`	`}`
`472`	`472`	`}`
`473`	`473`	`},`
Original file line number	Diff line number	Diff line change
`@@ -2168,8 +2168,8 @@ const data = {`
`2168`	`2168`	`},`
`2169`	`2169`	`millisecond: {`
`2170`	`2170`	`narrow: "ms.",`
`2171`		`- short: "ms",`
`2172`		`- wide: "millisekondes"`
	`2171`	`+ short: "ms.",`
	`2172`	`+ wide: "millisekonde"`
`2173`	`2173`	`}`
`2174`	`2174`	`}`
`2175`	`2175`	`},`
Original file line number	Diff line number	Diff line change
`@@ -465,8 +465,8 @@ const data = {`
`465`	`465`	`},`
`466`	`466`	`millisecond: {`
`467`	`467`	`narrow: "ms.",`
`468`		`- short: "ms",`
`469`		`- wide: "millisekondes"`
	`468`	`+ short: "ms.",`
	`469`	`+ wide: "millisekonde"`
`470`	`470`	`}`
`471`	`471`	`}`
`472`	`472`	`},`
Original file line number	Diff line number	Diff line change
`@@ -2416,7 +2416,7 @@ const data = {`
`2416`	`2416`	`millisecond: {`
`2417`	`2417`	`narrow: "ms",`
`2418`	`2418`	`short: "ms",`
`2419`		`- wide: "milisegundos"`
	`2419`	`+ wide: "milisegundu"`
`2420`	`2420`	`}`
`2421`	`2421`	`}`
`2422`	`2422`	`},`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ const data = {`
`435`	`435`	`millisecond: {`
`436`	`436`	`narrow: "ms",`
`437`	`437`	`short: "ms",`
`438`		`- wide: "milisegundos"`
	`438`	`+ wide: "milisegundu"`
`439`	`439`	`}`
`440`	`440`	`}`
`441`	`441`	`},`
Original file line number	Diff line number	Diff line change
`@@ -2465,7 +2465,7 @@ const data = {`
`2465`	`2465`	`millisecond: {`
`2466`	`2466`	`narrow: "мс",`
`2467`	`2467`	`short: "мс",`
`2468`		`- wide: "мілісекунды"`
	`2468`	`+ wide: "мілісекунда"`
`2469`	`2469`	`}`
`2470`	`2470`	`}`
`2471`	`2471`	`},`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ const data = {`
`441`	`441`	`millisecond: {`
`442`	`442`	`narrow: "мс",`
`443`	`443`	`short: "мс",`
`444`		`- wide: "мілісекунды"`
	`444`	`+ wide: "мілісекунда"`
`445`	`445`	`}`
`446`	`446`	`}`
`447`	`447`	`},`
Original file line number	Diff line number	Diff line change
`@@ -2464,7 +2464,7 @@ const data = {`
`2464`	`2464`	`millisecond: {`
`2465`	`2465`	`narrow: "мс",`
`2466`	`2466`	`short: "мс",`
`2467`		`- wide: "мілісекунды"`
	`2467`	`+ wide: "мілісекунда"`
`2468`	`2468`	`}`
`2469`	`2469`	`}`
`2470`	`2470`	`},`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ const data = {`
`440`	`440`	`millisecond: {`
`441`	`441`	`narrow: "мс",`
`442`	`442`	`short: "мс",`
`443`		`- wide: "мілісекунды"`
	`443`	`+ wide: "мілісекунда"`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`	`},`