parent
e5ef0a417a
commit
5ddb79cbe6
1 changed files with 2 additions and 1 deletions
|
@ -111,7 +111,8 @@ public class AccountConsole {
|
||||||
if (auth != null) user = auth.getUser();
|
if (auth != null) user = auth.getUser();
|
||||||
Locale locale = session.getContext().resolveLocale(user);
|
Locale locale = session.getContext().resolveLocale(user);
|
||||||
map.put("locale", locale.toLanguageTag());
|
map.put("locale", locale.toLanguageTag());
|
||||||
Properties messages = theme.getMessages(locale);
|
Properties messages = new Properties();
|
||||||
|
messages.putAll(theme.getMessages(locale));
|
||||||
if(StringUtil.isNotBlank(realm.getDefaultLocale())) {
|
if(StringUtil.isNotBlank(realm.getDefaultLocale())) {
|
||||||
messages.putAll(realm.getRealmLocalizationTextsByLocale(realm.getDefaultLocale()));
|
messages.putAll(realm.getRealmLocalizationTextsByLocale(realm.getDefaultLocale()));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue