fix: Fix .locale() handel unsupported locale

splashwizard · Dec 18, 2019 · 78ec173 · 78ec173
1 parent 6d51435
commit 78ec173
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -366,7 +366,8 @@ class Dayjs {
   locale(preset, object) {
     if (!preset) return this.$L
     const that = this.clone()
-    that.$L = parseLocale(preset, object, true)
+    const nextLocaleName = parseLocale(preset, object, true)
+    if (nextLocaleName) that.$L = nextLocaleName
     return that
   }
 

diff --git a/test/locale.test.js b/test/locale.test.js
@@ -121,3 +121,12 @@ describe('Instance locale inheritance', () => {
     expect(dayjs.locale()).toBe(moment.locale())
   })
 })
+
+
+it('Not supported locale string fallback to previous one', () => {
+  const D = dayjs()
+  const DFormat = D.format()
+  const D2 = D.locale('not_supported_locale_string')
+  const D2Format = D2.format()
+  expect(DFormat).toBe(D2Format)
+})