use the new lookup format when handling language

#1437
metasfresh · Dec 12, 2017 · 434dee3 · 434dee3
1 parent a349362
commit 434dee3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/actions/AppActions.js b/src/actions/AppActions.js
@@ -186,17 +186,14 @@ export function loginSuccess(auth) {
 
     getUserSession().then(session => {
       dispatch(userSessionInit(session.data));
-      languageSuccess(Object.keys(session.data.language)[0]);
-      initNumeralLocales(
-        Object.keys(session.data.language)[0],
-        session.data.locale
-      );
+      languageSuccess(session.data.language["key"]);
+      initNumeralLocales(session.data.language["key"], session.data.locale);
 
       auth.initSessionClient(session.data.websocketEndpoint, msg => {
         const me = JSON.parse(msg.body);
         dispatch(userSessionUpdate(me));
-        me.language && languageSuccess(Object.keys(me.language)[0]);
-        me.locale && initNumeralLocales(Object.keys(me.language)[0], me.locale);
+        me.language && languageSuccess(me.language["key"]);
+        me.locale && initNumeralLocales(me.language["key"], me.locale);
 
         getNotifications().then(response => {
           dispatch(

diff --git a/src/components/app/LoginForm.js b/src/components/app/LoginForm.js
@@ -49,7 +49,7 @@ class LoginForm extends Component {
 
     getUserLang().then(response => {
       //GET language shall always return a result
-      Moment.locale(Object.keys(response.data)[0]);
+      Moment.locale(response.data["key"]);
 
       if (redirect) {
         dispatch(goBack());