From 03af633e50b80e09ed8b41de0c19720132a51c3d Mon Sep 17 00:00:00 2001
From: Pierre-Michel Brown <pierremichelbrown@gmail.com>
Date: Tue, 17 Nov 2020 15:42:44 +0100
Subject: [PATCH] Address feedback on pending locale

---
 src/templates/plugin.main.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/templates/plugin.main.js b/src/templates/plugin.main.js
index bbfa7afa6..8e0bd47a4 100644
--- a/src/templates/plugin.main.js
+++ b/src/templates/plugin.main.js
@@ -219,7 +219,9 @@ export default async (context) => {
   }
 
   const waitForPendingLocale = async () => {
-    return !app.i18n.__pendingLocale || (await app.i18n.__pendingLocalePromise)
+    if (app.i18n.__pendingLocale) {
+      await app.i18n.__pendingLocalePromise
+    }
   }
 
   const getBrowserLocale = () => {
@@ -286,6 +288,9 @@ export default async (context) => {
     i18n.waitForPendingLocale = waitForPendingLocale
     i18n.getBrowserLocale = () => getBrowserLocale()
     i18n.__baseUrl = app.i18n.__baseUrl
+    i18n.__pendingLocale = app.i18n.__pendingLocale
+    i18n.__pendingLocalePromise = app.i18n.__pendingLocalePromise
+    i18n.__resolvePendingLocalePromise = app.i18n.__resolvePendingLocalePromise
   }
 
   // Set instance options