From e60c6dec19e7c1c98ca0cb588d485ba46e136505 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 3 Jul 2017 10:26:30 -0700
Subject: [PATCH] PLT-6935 Fixes issue when locale set to unknown (#6829)

---
 webapp/actions/global_actions.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index 1108e38348..2ab2692c02 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -356,15 +356,15 @@ export function sendEphemeralPost(message, channelId) {
 }
 
 export function newLocalizationSelected(locale) {
-    if (locale === 'en') {
+    const localeInfo = I18n.getLanguageInfo(locale);
+
+    if (locale === 'en' || !localeInfo) {
         AppDispatcher.handleServerAction({
             type: ActionTypes.RECEIVED_LOCALE,
             locale,
             translations: en
         });
     } else {
-        const localeInfo = I18n.getLanguageInfo(locale);
-
         Client4.getTranslations(localeInfo.url).then(
             (data, res) => {
                 let translations = data;