Merge pull request #3752 from cmgustavo/bug/set-available-languages

Set only available languages
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-08 11:55:56 -03:00
commit 5c2d1cbade
2 changed files with 6 additions and 20 deletions

View File

@ -9,16 +9,9 @@
<ul class="no-bullet m0 size-14">
<li class="line-b p10">kinoshitajona<span class="right text-gray size-12" translate>Japanese</span></li>
<li class="line-b p10">Kirvx<span class="right text-gray size-12" translate>French</span></li>
<li class="line-b p10">HostFat<span class="right text-gray size-12" translate>Italian</span></li>
<li class="line-b p10">koalalorenzo<span class="right text-gray size-12" translate>Italian</span></li>
<li class="line-b p10">nicolazza<span class="right text-gray size-12" translate>Italian</span></li>
<li class="line-b p10">saschad<span class="right text-gray size-12" translate>German</span></li>
<li class="line-b p10">8597fde7<span class="right text-gray size-12" translate>German</span></li>
<li class="line-b p10">pmichelazzo<span class="right text-gray size-12" translate>Portuguese</span></li>
<li class="line-b p10">johnblazakis<span class="right text-gray size-12" translate>Greek</span></li>
<li class="line-b p10">chek2fire1<span class="right text-gray size-12" translate>Greek</span></li>
<li class="line-b p10">cmgustavo83<span class="right text-gray size-12" translate>Spanish</span></li>
<li class="line-b p10">lax5<span class="right text-gray size-12" translate>Russian</span></li>
<li class="line-b p10">RussianNeuroMancer<span class="right text-gray size-12" translate>Russian</span></li>
</ul>
<div class="row m20t">
<div class="columns text-center">

View File

@ -9,21 +9,12 @@ angular.module('copayApp.services')
}, {
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',
@ -31,9 +22,6 @@ angular.module('copayApp.services')
}, {
name: 'Pусский',
isoCode: 'ru',
}, {
name: 'Türk',
isoCode: 'tr',
}];
root.currentLanguage = null;
@ -50,6 +38,11 @@ angular.module('copayApp.services')
}
userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
// Set only available languages
userLang = lodash.find(root.availableLanguages, {
'isoCode': userLang
}) ? userLang : 'en';
return userLang;
};