0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #212

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-10-27 06:24:10 +09:00
parent 93ffa2feb4
commit 9d290835b8
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/jp/sf/fess/helper/SystemHelper.java
View file

@ -60,6 +60,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.ibm.icu.util.ULocale;
public class SystemHelper implements Serializable {
@ -200,7 +201,8 @@ public class SystemHelper implements Serializable {
@Override
public List<Map<String, String>> load(final String key)
throws Exception {
final Locale displayLocale = LocaleUtils.toLocale(key);
final ULocale uLocale = new ULocale(key);
final Locale displayLocale = uLocale.toLocale();
final List<Map<String, String>> langItems = new ArrayList<>(
supportedLanguages.length);
final String msg = MessageResourcesUtil.getMessage(
@ -497,7 +499,8 @@ public class SystemHelper implements Serializable {
public List<Map<String, String>> getLanguageItems(final Locale locale) {
try {
return langItemsCache.get(locale.toString());
final String localeStr = locale.toString();
return langItemsCache.get(localeStr);
} catch (final ExecutionException e) {
final List<Map<String, String>> langItems = new ArrayList<>(
supportedLanguages.length);