fix: fallback locale bug (#64)

* fix: fallback locale with simple

* fix: bump typescript

Author: kazupon

examples/legacy/fallback/basic.html

@@ -17,7 +17,7 @@
       const i18n = createI18n({
         legacy: true,
         locale: 'ja',
-        fallbackLocale: ['en'],
+        fallbackLocale: 'en',
         messages: {
           en: {
             message: {

examples/legacy/fallback/suppress.html

@@ -17,7 +17,7 @@
       const i18n = createI18n({
         legacy: true,
         locale: 'ja',
-        fallbackLocale: ['en'],
+        fallbackLocale: 'en',
         silentFallbackWarn: true, // warning off
         messages: {
           en: {

examples/legacy/missing/handler.html

@@ -17,7 +17,7 @@
       const i18n = createI18n({
         legacy: true,
         locale: 'ja',
-        fallbackLocale: ['en'],
+        fallbackLocale: 'en',
         missing: (locale, key, instance) => {
           // something to do ...
           console.warn(`detect '${key}' key missing in '${locale}'`)

examples/legacy/missing/suppress.html

@@ -17,7 +17,7 @@
       const i18n = createI18n({
         legacy: true,
         locale: 'ja',
-        fallbackLocale: ['en'],
+        fallbackLocale: 'en',
         silentTranslationWarn: true, // warning off
         messages: {
           en: {

package.json

@@ -62,7 +62,7 @@
     "set-tz": "^0.2.0",
     "shipjs": "^0.19.0",
     "ts-jest": "^26.0.0",
-    "typescript": "^3.8.3",
+    "typescript": "^3.9.3",
     "typescript-eslint-language-service": "^3.0.0",
     "vue": "^3.0.0-beta.15"
   },
@@ -122,8 +122,8 @@
     "test:cover": "yarn test:unit --coverage",
     "test:e2e": "yarn build && jest --runInBand --config ./jest.e2e.config.js",
     "test:type": "tsc -p . --noEmit",
-    "test:unit": "cross-env NODE_ICU_DATA=./node_modules/full-icu jest --env node",
-    "test:watch": "cross-env NODE_ICU_DATA=./node_modules/full-icu jest --env node --watch"
+    "test:unit": "yarn clean:cache:jest && cross-env NODE_ICU_DATA=./node_modules/full-icu jest --env node",
+    "test:watch": "yarn clean:cache:jest && cross-env NODE_ICU_DATA=./node_modules/full-icu jest --env node --watch"
   },
   "sideEffects": false,
   "types": "dist/vue-i18n.d.ts",

src/core/context.ts

@@ -122,6 +122,7 @@ export function createRuntimeContext(
   const fallbackLocale =
     isArray(options.fallbackLocale) ||
     isPlainObject(options.fallbackLocale) ||
+    isString(options.fallbackLocale) ||
     options.fallbackLocale === false
       ? options.fallbackLocale
       : locale

test/core/translate.test.ts

@@ -113,6 +113,68 @@ describe('default option', () => {
   })
 })
 
+describe('context fallbackLocale option', () => {
+  test('false', () => {
+    const mockWarn = warn as jest.MockedFunction<typeof warn>
+    mockWarn.mockImplementation(() => {})
+
+    const ctx = context({
+      locale: 'en',
+      fallbackLocale: false,
+      messages: {
+        en: {}
+      }
+    })
+
+    expect(translate(ctx, 'hello')).toEqual('hello')
+    expect(mockWarn.mock.calls[0][0]).toEqual(
+      `Not found 'hello' key in 'en' locale messages.`
+    )
+  })
+
+  test('string', () => {
+    const mockWarn = warn as jest.MockedFunction<typeof warn>
+    mockWarn.mockImplementation(() => {})
+
+    const ctx = context({
+      locale: 'en',
+      fallbackLocale: 'ja',
+      messages: {
+        en: {},
+        ja: {
+          hello: 'こんにちは！'
+        }
+      }
+    })
+
+    expect(translate(ctx, 'hello')).toEqual('こんにちは！')
+    expect(mockWarn.mock.calls[0][0]).toEqual(
+      `Not found 'hello' key in 'en' locale messages.`
+    )
+  })
+
+  test('array', () => {
+    const mockWarn = warn as jest.MockedFunction<typeof warn>
+    mockWarn.mockImplementation(() => {})
+
+    const ctx = context({
+      locale: 'en',
+      fallbackLocale: ['ja'],
+      messages: {
+        en: {},
+        ja: {
+          hello: 'こんにちは！'
+        }
+      }
+    })
+
+    expect(translate(ctx, 'hello')).toEqual('こんにちは！')
+    expect(mockWarn.mock.calls[0][0]).toEqual(
+      `Not found 'hello' key in 'en' locale messages.`
+    )
+  })
+})
+
 describe('context missing option', () => {
   test('not specified missing handler', () => {
     const mockWarn = warn as jest.MockedFunction<typeof warn>

yarn.lock

@@ -6814,10 +6814,10 @@ typescript-eslint-language-service@^3.0.0:
   dependencies:
     read-pkg-up "^7.0.0"
 
-typescript@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+typescript@^3.9.3:
+  version "3.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
+  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
 
 typescript@~3.7.2:
   version "3.7.5"