From eeb63bb701d1b76804790e87ef8cabe9149fdb9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ch=C5=82odnicki?= <rchl2k@gmail.com>
Date: Thu, 12 Mar 2020 11:21:26 +0100
Subject: [PATCH] fix: Incomplete initialization with 'en-US' locale code and
 no default (#629)

When `defaultLocale` was not set, and there was locale with `en-US` code,
the code has failed to initialize locale (including failure to lazy-load lang
files) due to `newLocale === app.i18n.locale` check that returned true even
though we haven't fully initialized yet.

Resolves #628
---
 src/plugins/main.js |  6 +++++-
 test/module.test.js | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/plugins/main.js b/src/plugins/main.js
index ce9c75ddd..9d0b4db42 100644
--- a/src/plugins/main.js
+++ b/src/plugins/main.js
@@ -184,7 +184,11 @@ export default async (context) => {
   }
 
   // Set instance options
-  app.i18n = new VueI18n(typeof vueI18n === 'function' ? vueI18n(context) : vueI18n)
+  const vueI18nOptions = typeof vueI18n === 'function' ? vueI18n(context) : vueI18n
+  app.i18n = new VueI18n(vueI18nOptions)
+  // Initialize locale and fallbackLocale as vue-i18n defaults those to 'en-US' if falsey
+  app.i18n.locale = null
+  app.i18n.fallbackLocale = vueI18nOptions.fallbackLocale || null
   app.i18n.locales = locales
   app.i18n.defaultLocale = defaultLocale
   app.i18n.differentDomains = differentDomains
diff --git a/test/module.test.js b/test/module.test.js
index 60dbe760a..8dfca4ed1 100644
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -837,6 +837,50 @@ describe('differentDomains enabled', () => {
   })
 })
 
+// This is a special case due to vue-i18n defaulting to en-US for `defaultLocale`
+// and `fallbackLocale` which can prevent us from applying locale initially.
+describe('en-US locale with no explicit default locale (issue #628)', () => {
+  let nuxt
+
+  beforeAll(async () => {
+    const override = {
+      i18n: {
+        lazy: true,
+        langDir: 'lang/',
+        defaultLocale: null,
+        vueI18n: {
+          fallbackLocale: null,
+          messages: null
+        }
+      }
+    }
+
+    const localConfig = loadConfig(__dirname, 'basic', override, { merge: true })
+
+    // Override after merging options to avoid arrays being merged.
+    localConfig.i18n.locales = [
+      {
+        code: 'en-US',
+        iso: 'en-US',
+        name: 'English',
+        file: 'en-US.js'
+      }
+    ]
+
+    nuxt = (await setup(localConfig)).nuxt
+  })
+
+  afterAll(async () => {
+    await nuxt.close()
+  })
+
+  test('prefix is present and locale is applied', async () => {
+    const html = await get('/en-US')
+    const dom = getDom(html)
+    await expect(dom.querySelector('body').textContent).toContain('page: Homepage')
+  })
+})
+
 describe('external vue-i18n configuration', () => {
   let nuxt