EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1414 from dpalou/MOBILE-2510 

MOBILE-2510 lang: Fix forcing default lang when wasn't needed
main
Juan Leyva 2018-07-18 10:40:47 +02:00 committed by GitHub
parent 50637d0377 4de2510140
commit 72162667b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/providers/lang.ts
View File

@ -173,7 +173,7 @@ export class CoreLangProvider {
return language;
}).catch(() => {
// User hasn't defined a language. If default language is forced, use it.
if (CoreConfigConstants.default_lang && !CoreConfigConstants.forcedefaultlanguage) {
if (CoreConfigConstants.default_lang && CoreConfigConstants.forcedefaultlanguage) {
return CoreConfigConstants.default_lang;
}
@ -190,6 +190,11 @@ export class CoreLangProvider {
}
}
if (typeof CoreConfigConstants.languages[language] == 'undefined') {
// Language not supported, use fallback language.
return this.fallbackLanguage;
}
return language;
}).catch(() => {
// Error getting locale. Use default language.