From bde2de503e28d4532ee20eb29824565c6ad35cef Mon Sep 17 00:00:00 2001
From: Jared Stoffan <jstoffan@users.noreply.github.com>
Date: Thu, 16 Apr 2020 13:50:26 -0700
Subject: [PATCH] fix(i18n): Fix i18n utility locale fallback logic (#432)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 src/utils/i18n.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index 8c3967a50..233153978 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -1,13 +1,12 @@
-import annotationsLocaleData from 'box-annotations-locale-data'; // eslint-disable-line
+import annotationsLocaleData from 'box-annotations-locale-data';
 import boxElementsMessages from 'box-elements-messages';
 import { createIntl, createIntlCache, IntlShape } from 'react-intl';
-import { IntlOptions } from '../@types/i18n';
+import { IntlOptions } from '../@types';
 
 declare const __LANGUAGE__: string; // eslint-disable-line no-underscore-dangle
 
-const language = __LANGUAGE__;
-const getLocale = (lang: string = language): string => {
-    return lang.substr(0, lang.indexOf('-'));
+const getLocale = (language: string = __LANGUAGE__): string => {
+    return language.substr(0, language.indexOf('-'));
 };
 
 if (!window.Intl.PluralRules) {
@@ -22,14 +21,14 @@ if (!window.Intl.RelativeTimeFormat) {
 
 const annotationsMessages = { ...annotationsLocaleData, ...boxElementsMessages };
 const intlCache = createIntlCache();
-const createIntlProvider = ({ locale = getLocale(), messages = annotationsMessages }: IntlOptions = {}): IntlShape => {
+const createIntlProvider = ({ language, locale, messages = annotationsMessages }: IntlOptions = {}): IntlShape => {
     return createIntl(
         {
             messages,
-            locale,
+            locale: locale || getLocale(language),
         },
         intlCache,
     );
 };
 
-export default { createIntlProvider, getLocale, language };
+export default { createIntlProvider, getLocale };