- // Set locale according to Config's language property
- String langCode = Config.getLanguageCode();
- if (locale == null && langCode != null) {
- Locale configLocale = getLanguage(langCode);
- if (configLocale != null) {locale = configLocale;}
+ if (locale != null) {
+ // Make sure Config holds chosen language
+ Config.setConfigString(Config.KEY_LANGUAGE_CODE, localeCode);
+ }
+ else {
+ // Set locale according to Config's language property
+ String configLang = Config.getConfigString(Config.KEY_LANGUAGE_CODE);
+ if (configLang != null) {
+ Locale configLocale = getLanguage(configLang);
+ if (configLocale != null) {locale = configLocale;}
+ }