From f1db5e1c962e458cc5da787cf8c248ebe23294f8 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Fri, 19 Sep 2014 14:49:46 +0400
Subject: [PATCH] Moved i18n locale apply to boot

Moved i18n config to config.js
App is booted after locale data is fully downloaded
The app needs reload after locale change
---
 app/js/controllers.js |  4 +-
 app/js/i18n.js        | 85 ++++---------------------------------------
 app/js/init.js        | 66 +++++++++++++++++++++++++++++++--
 app/js/lib/config.js  | 12 ++++++
 4 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 70d40b66..5e34305f 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -2185,8 +2185,10 @@ angular.module('myApp.controllers', ['myApp.i18n'])
       }
 
       $scope.$watch('i18n.locale', function (newValue, oldValue) {
-        _.locale(newValue);
         Storage.set({i18n_locale: newValue});
+        ErrorService.confirm({type: 'APPLY_LANG_WITH_RELOAD'}).then(function () {
+          location.reload();
+        });
       });
     });
 
diff --git a/app/js/i18n.js b/app/js/i18n.js
index 9e23606b..0fbfb0f6 100644
--- a/app/js/i18n.js
+++ b/app/js/i18n.js
@@ -1,16 +1,10 @@
 'use strict';
 
 angular.module('myApp.i18n', ['izhukov.utils'])
-  .factory('_', ['$http', '$route', 'Storage', '$locale', function($http, $route, Storage, $locale) {
-    var locale = 'en-us';
-    var messages = {};
-    var fallbackMessages = {};
-    var supported = {
-      'en-us': 'English'
-    };
-    var aliases = {
-      'en': 'en-us'
-    };
+  .factory('_', [function() {
+    var locale = Config.I18n.locale;
+    var messages = Config.I18n.messages;
+    var fallbackMessages = Config.I18n.fallback_messages;
     var paramRegEx = /\{\s*([a-zA-Z\d\--]+)(?:\s*:\s*(.*?))?\s*\}/g;
 
     function insertParams(msgstr, params) {
@@ -82,77 +76,14 @@ angular.module('myApp.i18n', ['izhukov.utils'])
       return msgstr;
     }
 
-    _.supported = function() {
-      return supported;
+    _.supported = function () {
+      return Config.I18n.supported;
     };
 
-    _.locale = function(newValue) {
-      if (newValue === undefined) {
-        return locale;
-      }
-
-      if (!supported.hasOwnProperty(newValue)) {
-        newValue = 'en-us'; // fallback
-      }
-
-      if (locale != newValue) {
-        var newMessages = false;
-        var ngLocaleReady = false;
-        var onReady = function() {
-          if (newMessages === false || ngLocaleReady === false) {
-            // only execute when both - ngLocale and the new messages - are loaded
-            return;
-          }
-          function deepUpdate(oldValue, newValue) {
-            for (var i in newValue) {
-              if (i in oldValue && typeof oldValue[i] === 'object' && i !== null){
-                deepUpdate(oldValue[i], newValue[i]);
-              } else {
-                oldValue[i] = newValue[i];
-              }
-            }
-          }
-          // first we need to explizitly request the new $locale so it gets initialized
-          // then we recursively update our current $locale with it so all other modules
-          // already holding a reference to our $locale will get the new values as well
-          // this hack is necessary because ngLocale just isn't designed to be changed at runtime
-          deepUpdate($locale, angular.injector(['ngLocale']).get('$locale'));
-          messages = newMessages;
-          locale = newValue;
-          $route.reload();
-        };
-
-        angular.element('<script>')
-          .appendTo(angular.element('head'))
-          .on('load', function() {
-            ngLocaleReady = true;
-            onReady();
-          })
-          .attr('src', 'vendor/angular/i18n/angular-locale_' + newValue + '.js');
-
-        $http({method: 'GET', url: 'js/locales/' + newValue + '.json'}).success(function(json){
-          newMessages = json;
-          onReady();
-        });
-      }
+    _.locale = function () {
+      return locale;
     };
 
-    $http({method: 'GET', url: 'js/locales/en-us.json'}).success(function(json){
-      fallbackMessages = json;
-      if (locale == 'en-us') {
-        messages = fallbackMessages;
-      }
-      $route.reload();
-    });
-
-    Storage.get('i18n_locale').then(function(newLocale) {
-      if (!newLocale) {
-        newLocale = (navigator.language || '').toLowerCase();
-        newLocale = aliases[newLocale] ? aliases[newLocale] : newLocale;
-      }
-      _.locale(newLocale);
-    });
-
     return _;
   }])
 
diff --git a/app/js/init.js b/app/js/init.js
index c179712f..16d8e536 100644
--- a/app/js/init.js
+++ b/app/js/init.js
@@ -72,18 +72,78 @@
   }
   $(document.body).addClass(classes.join(' '));
 
-  ConfigStorage.get('current_layout', function (layout) {
+  ConfigStorage.get('current_layout', 'i18n_locale', function (params) {
+    var layout = params[0],
+        locale = params[1],
+        defaultLocale = 'en-us',
+        bootReady = {
+          dom: false,
+          i18n_ng: Config.I18n.locale == defaultLocale, // Already included
+          i18n_messages: false,
+          i18n_fallback: false
+        }
+
     switch (layout) {
       case 'mobile': Config.Mobile = true; break;
       case 'desktop': Config.Mobile = false; break;
       default: Config.Mobile = Config.Navigator.mobile; break;
     }
-
     $('head').append(
       '<link rel="stylesheet" href="css/' + (Config.Mobile ? 'mobile.css' : 'desktop.css') + '" />'
     );
+
+    if (!locale) {
+      locale = (navigator.language || '').toLowerCase();
+      locale = Config.I18n.aliases[locale] || locale;
+    }
+    if (Config.I18n.supported[locale]) {
+      Config.I18n.locale = locale;
+    }
+
+    if (!bootReady.i18n_ng) {
+      $('head').append($('<script>')
+        .on('load', function() {
+          bootReady.i18n_ng = true;
+          checkReady();
+        })
+        .attr('src', 'vendor/angular/i18n/angular-locale_' + Config.I18n.locale + '.js')
+      );
+    }
+
+    $.get('js/locales/' + Config.I18n.locale + '.json').success(function (json) {
+      Config.I18n.messages = json;
+      bootReady.i18n_messages = true;
+      if (locale == defaultLocale) { // No fallback, leave empty object
+        bootReady.i18n_fallback = true;
+      }
+      checkReady();
+    });
+
+    if (Config.I18n.locale != defaultLocale) {
+      $.get('js/locales/en-us.json').success(function (json) {
+        Config.I18n.fallback_messages = json;
+        bootReady.i18n_fallback = true;
+        checkReady();
+      });
+    }
+
     $(document).ready(function() {
-      angular.bootstrap(document, ['myApp']);
+      bootReady.dom = true;
+      checkReady();
     });
+
+    var checkReady = function checkReady () {
+      var i, ready = true;
+      for (i in bootReady) {
+        if (bootReady.hasOwnProperty(i) && bootReady[i] === false) {
+          ready = false;
+          break;
+        }
+      }
+      if (ready) {
+        bootReady.boot = false; 
+        angular.bootstrap(document, ['myApp']);
+      }
+    }
   });
 })();
\ No newline at end of file
diff --git a/app/js/lib/config.js b/app/js/lib/config.js
index 5c05289b..0d5b539f 100644
--- a/app/js/lib/config.js
+++ b/app/js/lib/config.js
@@ -41,6 +41,18 @@ Config.Navigator = {
   mobile: screen.width < 480
 };
 
+Config.I18n = {
+  locale: 'en-us',
+  supported: {
+    'en-us': 'English'
+  },
+  aliases: {
+    'en': 'en-us'
+  },
+  messages: {},
+  fallback_messages: {}
+};
+
 Config.Schema = Config.Schema || {};
 
 Config.Schema.MTProto = {"constructors":[{"id":"481674261","predicate":"vector","params":[],"type":"Vector t"},{"id":"85337187","predicate":"resPQ","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"pq","type":"bytes"},{"name":"server_public_key_fingerprints","type":"Vector<long>"}],"type":"ResPQ"},{"id":"-2083955988","predicate":"p_q_inner_data","params":[{"name":"pq","type":"bytes"},{"name":"p","type":"bytes"},{"name":"q","type":"bytes"},{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"new_nonce","type":"int256"}],"type":"P_Q_inner_data"},{"id":"2043348061","predicate":"server_DH_params_fail","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"new_nonce_hash","type":"int128"}],"type":"Server_DH_Params"},{"id":"-790100132","predicate":"server_DH_params_ok","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"encrypted_answer","type":"bytes"}],"type":"Server_DH_Params"},{"id":"-1249309254","predicate":"server_DH_inner_data","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"g","type":"int"},{"name":"dh_prime","type":"bytes"},{"name":"g_a","type":"bytes"},{"name":"server_time","type":"int"}],"type":"Server_DH_inner_data"},{"id":"1715713620","predicate":"client_DH_inner_data","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"retry_id","type":"long"},{"name":"g_b","type":"bytes"}],"type":"Client_DH_Inner_Data"},{"id":"1003222836","predicate":"dh_gen_ok","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"new_nonce_hash1","type":"int128"}],"type":"Set_client_DH_params_answer"},{"id":"1188831161","predicate":"dh_gen_retry","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"new_nonce_hash2","type":"int128"}],"type":"Set_client_DH_params_answer"},{"id":"-1499615742","predicate":"dh_gen_fail","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"new_nonce_hash3","type":"int128"}],"type":"Set_client_DH_params_answer"},{"id":"-212046591","predicate":"rpc_result","params":[{"name":"req_msg_id","type":"long"},{"name":"result","type":"Object"}],"type":"RpcResult"},{"id":"558156313","predicate":"rpc_error","params":[{"name":"error_code","type":"int"},{"name":"error_message","type":"string"}],"type":"RpcError"},{"id":"1579864942","predicate":"rpc_answer_unknown","params":[],"type":"RpcDropAnswer"},{"id":"-847714938","predicate":"rpc_answer_dropped_running","params":[],"type":"RpcDropAnswer"},{"id":"-1539647305","predicate":"rpc_answer_dropped","params":[{"name":"msg_id","type":"long"},{"name":"seq_no","type":"int"},{"name":"bytes","type":"int"}],"type":"RpcDropAnswer"},{"id":"155834844","predicate":"future_salt","params":[{"name":"valid_since","type":"int"},{"name":"valid_until","type":"int"},{"name":"salt","type":"long"}],"type":"FutureSalt"},{"id":"-1370486635","predicate":"future_salts","params":[{"name":"req_msg_id","type":"long"},{"name":"now","type":"int"},{"name":"salts","type":"vector<future_salt>"}],"type":"FutureSalts"},{"id":"880243653","predicate":"pong","params":[{"name":"msg_id","type":"long"},{"name":"ping_id","type":"long"}],"type":"Pong"},{"id":"-501201412","predicate":"destroy_session_ok","params":[{"name":"session_id","type":"long"}],"type":"DestroySessionRes"},{"id":"1658015945","predicate":"destroy_session_none","params":[{"name":"session_id","type":"long"}],"type":"DestroySessionRes"},{"id":"-1631450872","predicate":"new_session_created","params":[{"name":"first_msg_id","type":"long"},{"name":"unique_id","type":"long"},{"name":"server_salt","type":"long"}],"type":"NewSession"},{"id":"1945237724","predicate":"msg_container","params":[{"name":"messages","type":"vector<%Message>"}],"type":"MessageContainer"},{"id":"1538843921","predicate":"message","params":[{"name":"msg_id","type":"long"},{"name":"seqno","type":"int"},{"name":"bytes","type":"int"},{"name":"body","type":"Object"}],"type":"Message"},{"id":"-530561358","predicate":"msg_copy","params":[{"name":"orig_message","type":"Message"}],"type":"MessageCopy"},{"id":"812830625","predicate":"gzip_packed","params":[{"name":"packed_data","type":"bytes"}],"type":"Object"},{"id":"1658238041","predicate":"msgs_ack","params":[{"name":"msg_ids","type":"Vector<long>"}],"type":"MsgsAck"},{"id":"-1477445615","predicate":"bad_msg_notification","params":[{"name":"bad_msg_id","type":"long"},{"name":"bad_msg_seqno","type":"int"},{"name":"error_code","type":"int"}],"type":"BadMsgNotification"},{"id":"-307542917","predicate":"bad_server_salt","params":[{"name":"bad_msg_id","type":"long"},{"name":"bad_msg_seqno","type":"int"},{"name":"error_code","type":"int"},{"name":"new_server_salt","type":"long"}],"type":"BadMsgNotification"},{"id":"2105940488","predicate":"msg_resend_req","params":[{"name":"msg_ids","type":"Vector<long>"}],"type":"MsgResendReq"},{"id":"-630588590","predicate":"msgs_state_req","params":[{"name":"msg_ids","type":"Vector<long>"}],"type":"MsgsStateReq"},{"id":"81704317","predicate":"msgs_state_info","params":[{"name":"req_msg_id","type":"long"},{"name":"info","type":"bytes"}],"type":"MsgsStateInfo"},{"id":"-1933520591","predicate":"msgs_all_info","params":[{"name":"msg_ids","type":"Vector<long>"},{"name":"info","type":"bytes"}],"type":"MsgsAllInfo"},{"id":"661470918","predicate":"msg_detailed_info","params":[{"name":"msg_id","type":"long"},{"name":"answer_msg_id","type":"long"},{"name":"bytes","type":"int"},{"name":"status","type":"int"}],"type":"MsgDetailedInfo"},{"id":"-2137147681","predicate":"msg_new_detailed_info","params":[{"name":"answer_msg_id","type":"long"},{"name":"bytes","type":"int"},{"name":"status","type":"int"}],"type":"MsgDetailedInfo"}],"methods":[{"id":"1615239032","method":"req_pq","params":[{"name":"nonce","type":"int128"}],"type":"ResPQ"},{"id":"-686627650","method":"req_DH_params","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"p","type":"bytes"},{"name":"q","type":"bytes"},{"name":"public_key_fingerprint","type":"long"},{"name":"encrypted_data","type":"bytes"}],"type":"Server_DH_Params"},{"id":"-184262881","method":"set_client_DH_params","params":[{"name":"nonce","type":"int128"},{"name":"server_nonce","type":"int128"},{"name":"encrypted_data","type":"bytes"}],"type":"Set_client_DH_params_answer"},{"id":"1491380032","method":"rpc_drop_answer","params":[{"name":"req_msg_id","type":"long"}],"type":"RpcDropAnswer"},{"id":"-1188971260","method":"get_future_salts","params":[{"name":"num","type":"int"}],"type":"FutureSalts"},{"id":"2059302892","method":"ping","params":[{"name":"ping_id","type":"long"}],"type":"Pong"},{"id":"-213746804","method":"ping_delay_disconnect","params":[{"name":"ping_id","type":"long"},{"name":"disconnect_delay","type":"int"}],"type":"Pong"},{"id":"-414113498","method":"destroy_session","params":[{"name":"session_id","type":"long"}],"type":"DestroySessionRes"},{"id":"-1835453025","method":"http_wait","params":[{"name":"max_delay","type":"int"},{"name":"wait_after","type":"int"},{"name":"max_wait","type":"int"}],"type":"HttpWait"}]};