anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix language

Browse source
This commit is contained in:
Javier 2016-09-05 11:25:30 -03:00
commit 50c30c25ec
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/js/services/uxLanguage.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services') angular.module('copayApp.services')
.factory('uxLanguage', function languageService($log, lodash, gettextCatalog, amMoment, configService) { .factory('uxLanguage', function languageService($log, $timeout, lodash, gettextCatalog, amMoment, configService) {
var root = {}; var root = {};
root.currentLanguage = null; root.currentLanguage = null;
@ -72,7 +72,8 @@ angular.module('copayApp.services')
root._set = function(lang) { root._set = function(lang) {
$log.debug('Setting default language: ' + lang); $log.debug('Setting default language: ' + lang);
gettextCatalog.setCurrentLanguage(lang); gettextCatalog.setCurrentLanguage(lang);
root.currentLanguage = lang; root.currentLanguage = lang;
if (lang == 'zh') lang = lang + '-CN'; // Fix for Chinese Simplified if (lang == 'zh') lang = lang + '-CN'; // Fix for Chinese Simplified
amMoment.changeLocale(lang); amMoment.changeLocale(lang);
}; };
@ -96,9 +97,18 @@ angular.module('copayApp.services')
}; };
root.init = function() { root.init = function() {
root._detect(function(lang) { $timeout(function() {
root._set(lang); var userLang = configService.getSync().wallet.settings.defaultLanguage;
});
if (userLang && userLang != root.currentLanguage) {
root._set(userLang);
return;
}
root._detect(function(lang) {
root._set(lang);
});
}, 100);
}; };
root.update = function(cb) { root.update = function(cb) {