From 4d506b6e4d67f3e33f767731693c433dc46c1c7d Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 4 May 2018 11:21:34 -0400
Subject: [PATCH] Moved getCurrentUserLocale to mattermost-redux (#1652)

---
 app/i18n/index.js     |  4 ++--
 app/selectors/i18n.js | 24 ++++--------------------
 package-lock.json     |  2 +-
 package.json          |  2 +-
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/app/i18n/index.js b/app/i18n/index.js
index 9539f5f88..66524bd9c 100644
--- a/app/i18n/index.js
+++ b/app/i18n/index.js
@@ -17,6 +17,8 @@ import trLocaleData from 'react-intl/locale-data/tr';
 import ruLocaleData from 'react-intl/locale-data/ru';
 import zhLocaleData from 'react-intl/locale-data/zh';
 
+import {DEFAULT_LOCALE} from 'mattermost-redux/constants/general';
+
 import de from 'assets/i18n/de.json';
 import en from 'assets/i18n/en.json';
 import es from 'assets/i18n/es.json';
@@ -32,8 +34,6 @@ import ru from 'assets/i18n/ru.json';
 import zhCN from 'assets/i18n/zh-CN.json';
 import zhTW from 'assets/i18n/zh-TW.json';
 
-export const DEFAULT_LOCALE = 'en';
-
 const TRANSLATIONS = {
     de,
     en,
diff --git a/app/selectors/i18n.js b/app/selectors/i18n.js
index 19134110d..01003c755 100644
--- a/app/selectors/i18n.js
+++ b/app/selectors/i18n.js
@@ -2,30 +2,14 @@
 // See License.txt for license information.
 
 import DeviceInfo from 'react-native-device-info';
-import {createSelector} from 'reselect';
 
-import DEFAULT_LOCALE from 'app/i18n';
-
-import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
-
-export const getCurrentUserLocale = createSelector(
-    getCurrentUser,
-    (currentUser) => {
-        return currentUser ? currentUser.locale : '';
-    }
-);
+import {DEFAULT_LOCALE} from 'mattermost-redux/constants/general';
+import {getCurrentUserLocale} from 'mattermost-redux/selectors/entities/i18n';
 
 // Not a proper selector since the device locale isn't in the redux store
 export function getCurrentLocale(state) {
-    const userLocale = getCurrentUserLocale(state);
-    if (userLocale) {
-        return userLocale;
-    }
-
     const deviceLocale = DeviceInfo.getDeviceLocale().split('-')[0];
-    if (deviceLocale) {
-        return deviceLocale;
-    }
+    const defaultLocale = deviceLocale || DEFAULT_LOCALE;
 
-    return DEFAULT_LOCALE;
+    return getCurrentUserLocale(state, defaultLocale);
 }
diff --git a/package-lock.json b/package-lock.json
index e0a5cc51f..1205fbd64 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9864,7 +9864,7 @@
       }
     },
     "mattermost-redux": {
-      "version": "github:mattermost/mattermost-redux#6e347814cfefdd8ef3292fef2576ff8a0f082b58",
+      "version": "github:mattermost/mattermost-redux#e20f8881e6d1a8eaff76bb5ac98a2f3d884804d1",
       "requires": {
         "deep-equal": "1.0.1",
         "form-data": "2.3.1",
diff --git a/package.json b/package.json
index f567e5941..023ea5faf 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "fuse.js": "^3.2.0",
     "intl": "1.2.5",
     "jail-monkey": "1.0.0",
-    "mattermost-redux": "github:mattermost/mattermost-redux#6e347814cfefdd8ef3292fef2576ff8a0f082b58",
+    "mattermost-redux": "github:mattermost/mattermost-redux#e20f8881e6d1a8eaff76bb5ac98a2f3d884804d1",
     "prop-types": "15.6.1",
     "react": "16.3.2",
     "react-intl": "2.4.0",