fix: fix locally using region tag changing global locale (iamkun#1875)

Juanc1to · May 31, 2022 · 7af7c23 · 7af7c23
1 parent 05cba7e
commit 7af7c23
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -22,7 +22,7 @@ const parseLocale = (preset, object, isLocal) => {
     }
     const presetSplit = preset.split('-')
     if (!l && presetSplit.length > 1) {
-      return parseLocale(presetSplit[0])
+      return parseLocale(presetSplit[0], object, isLocal)
     }
   } else {
     const { name } = preset

diff --git a/test/locale.test.js b/test/locale.test.js
@@ -34,6 +34,28 @@ it('set locale for one instance only', () => {
     .toBe('Saturday 28, April')
 })
 
+// The following two tests were added in response to this bug:
+// <https://github.com/iamkun/dayjs/issues/1875>.
+it('handles region tags', () => {
+  expect(dayjs('2018-4-28')
+    .locale('es-us').format(format))
+    .toBe('sábado 28, abril')
+
+  expect(dayjs('2018-4-28')
+    .format(format))
+    .toBe('Saturday 28, April')
+})
+
+it('handles unknown region tags with the base language', () => {
+  expect(dayjs('2018-4-28')
+    .locale('es-XX').format(format))
+    .toBe('sábado 28, abril')
+
+  expect(dayjs('2018-4-28')
+    .format(format))
+    .toBe('Saturday 28, April')
+})
+
 it('set global locale', () => {
   dayjs.locale('en')
   expect(dayjs('2018-4-28').format(format))