refactor ux language handling

This commit is contained in:
Matias Alejo Garcia 2015-08-27 12:07:13 -03:00
commit 55afc4d9d4
8 changed files with 125 additions and 81 deletions

View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services')
.factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, ledger) {
.factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, ledger, uxLanguage) {
var root = {};
@ -165,11 +165,20 @@ angular.module('copayApp.services')
});
};
root._seedWallet = function(walletClient) {
var config = configService.getSync().wallet.settings;
console.log('[profileService.js.169:config:]',config); //TODO
asdd;
walletClient.seedFromRandomWithMnemonic('livenet',null, mnemonicLang);
root._seedWallet = function(walletClient, network) {
var lang = uxLanguage.getCurrentLanguage();
try {
walletClient.seedFromRandomWithMnemonic(network, null, lang);
} catch (e) {
$log.info('Error creating seed: ' + e.message);
if (e.message.indexOf('language') > 0) {
$log.info('Using default language for mnemonic');
walletClient.seedFromRandomWithMnemonic(network);
} else {
throw (e);
}
}
};
root._createNewProfile = function(opts, cb) {
@ -179,7 +188,7 @@ asdd;
}
var walletClient = bwcService.getClient();
this._seedWallet(walletClient);
root._seedWallet(walletClient, 'livenet');
walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
network: 'livenet'
@ -209,10 +218,7 @@ asdd;
return cb(gettext('Could not create using the specified extended public key'));
}
}
// TODO LANG...
// TODO...
$log.warn("TODO LANG!")
walletClient.seedFromRandomWithMnemonic(opts.networkName);
root._seedWallet(walletClient, opts.networkName);
walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
network: opts.networkName

View file

@ -0,0 +1,95 @@
'use strict';
angular.module('copayApp.services')
.factory('uxLanguage', function languageService($log, lodash, gettextCatalog, amMoment, configService) {
var root = {};
root.availableLanguages = [{
name: 'English',
isoCode: 'en',
}, {
name: 'Français',
isoCode: 'fr',
}, {
name: 'Italiano',
isoCode: 'it',
}, {
name: 'Deutsch',
isoCode: 'de',
}, {
name: 'Español',
isoCode: 'es',
}, {
name: 'Português',
isoCode: 'pt',
}, {
name: 'Ελληνικά',
isoCode: 'el',
}, {
name: '日本語',
isoCode: 'ja',
}, {
name: 'Pусский',
isoCode: 'ru',
}];
root.currentLanguage = null;
root._detect = function() {
// Auto-detect browser language
var userLang, androidLang;
if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
userLang = androidLang[1];
} else {
// works for iOS and Android 4.x
userLang = navigator.userLanguage || navigator.language;
}
userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
return userLang;
};
root._set = function(lang) {
$log.debug('Setting default language: ' + lang);
gettextCatalog.setCurrentLanguage(lang);
amMoment.changeLocale(lang);
root.currentLanguage = lang;
};
root.getCurrentLanguage = function() {
return root.currentLanguage;
};
root.getCurrentLanguageName = function() {
return root.getName(root.currentLanguage);
};
root.getLanguages = function() {
return root.availableLanguages;
};
root.init = function() {
root._set(root._detect());
};
root.update = function() {
var userLang = configService.getSync().wallet.settings.defaultLanguage;
if (!userLang) {
userLang = root._detect();
}
if (userLang != gettextCatalog.getCurrentLanguage()) {
root._set(userLang);
}
return userLang;
};
root.getName = function(lang) {
return lodash.result(lodash.find(root.availableLanguages, {
'isoCode': lang
}), 'name');
};
return root;
});