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

fix rebase conflicts

Browse source
This commit is contained in:
Gabriel Bazán 2016-01-13 16:12:12 -03:00
commit 388bd1fd3d
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,23 +35,24 @@ angular.module('copayApp.services')
// works for iOS and Android 4.x // works for iOS and Android 4.x
userLang = preferedLanguage.value; userLang = preferedLanguage.value;
userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en'; userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
// Set only available languages
userLang = root.isAvailableLanguage(userLang);
return cb(userLang); return cb(userLang);
}); });
} else { } else {
// Auto-detect browser language // Auto-detect browser language
userLang = navigator.userLanguage || navigator.language; userLang = navigator.userLanguage || navigator.language;
userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en'; userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
// Set only available languages
userLang = root.isAvailableLanguage(userLang);
return cb(userLang); return cb(userLang);
} }
};
userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en'; root.isAvailableLanguage = function(userLang) {
return lodash.find(root.availableLanguages, {
// Set only available languages
userLang = lodash.find(root.availableLanguages, {
'isoCode': userLang 'isoCode': userLang
}) ? userLang : 'en'; }) ? userLang : 'en';
return userLang;
}; };
root._set = function(lang) { root._set = function(lang) {