#292 - language persistance

Former-commit-id: b076051bbe484a168f280330fbc87d98afca5d06

1 files changed, 39 insertions, 32 deletions

diff --git a/www/js/app.js b/www/js/app.js
index 03955d29..7d94a571 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1255,47 +1255,54 @@ angular.module('zmApp', [
 
 
                 $ionicNativeTransitions.enable(true, false);
+                
+                // At this stage, DataModel.init is not called yet
+                // but I do need to know the language
+                
+                ZMDataModel.zmLog ("Retrieving language before init is called...");
+                localforage.getItem("defaultLang")
+                .then (function(val) {
 
+                    var lang = val;
+                    console.log (">>>>>>>>>>>>>> LANG IS " + val);
 
-                var lang = ZMDataModel.getDefaultLanguage();
 
+                    if (lang == undefined || lang == null) {
+                        ZMDataModel.zmLog("No language set, switching to en");
+                        lang = "en";
 
-                if (lang == undefined) {
-                    ZMDataModel.zmLog("No language set, switching to en");
-                    lang = "en";
 
+                    } else {
+                        ZMDataModel.zmLog("Language stored as:" + lang);
 
-                } else {
-                    ZMDataModel.zmLog("Language stored as:" + lang);
+                    }
 
-                }
-                 //continueRestOfInit();
-                // This always returns success - I'm not rejecting
-                ZMDataModel.setDefaultLanguage(lang, false)
-                    .then(function (success) {
-                        ZMDataModel.zmLog(">>>>Language to be used:" + $translate.proposedLanguage());
-                        moment.locale($translate.proposedLanguage());
-                    
-                        // Remember this is before data Init
-                        // so I need to do a direct forage fetch
-                        localforage.getItem("isFirstUse")
-                        .then (function(val)
-                        {
-                            console.log ("isFirstUse is " + val);
-                            if (val == null || val == true)
-                            {
-                                ZMDataModel.zmLog ("First time detected");
-                                $state.go("first-use");
-                            }
-                            else
+                    ZMDataModel.setDefaultLanguage(lang, false)
+                        .then(function (success) {
+                            ZMDataModel.zmLog(">>>>Language to be used:" + $translate.proposedLanguage());
+                            moment.locale($translate.proposedLanguage());
+
+                            // Remember this is before data Init
+                            // so I need to do a direct forage fetch
+                            localforage.getItem("isFirstUse")
+                            .then (function(val)
                             {
-                             continueRestOfInit();     
-                            }
-                            
+                                console.log ("isFirstUse is " + val);
+                                if (val == null || val == true)
+                                {
+                                    ZMDataModel.zmLog ("First time detected");
+                                    $state.go("first-use");
+                                }
+                                else
+                                {
+                                 continueRestOfInit();     
+                                }
+
+                            });
+
+
                         });
-                    
-                                
-                    });
+                });
             }