From 4a1c4fa1a0b1182169ad7278d70258edcda559a7 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 24 Sep 2015 14:19:22 +0200 Subject: [PATCH] No partial fallbacks for bundles are allowed anymore. --- .../java/net/sf/jabref/logic/l10n/Localization.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/sf/jabref/logic/l10n/Localization.java b/src/main/java/net/sf/jabref/logic/l10n/Localization.java index 0809b20ae3e..5df6bd3a1b1 100644 --- a/src/main/java/net/sf/jabref/logic/l10n/Localization.java +++ b/src/main/java/net/sf/jabref/logic/l10n/Localization.java @@ -29,24 +29,17 @@ public static void setLanguage(String language) { // silent fallback to system locale when bundle is not found if(!messages.getLocale().equals(locale)) { - LOGGER.warn("Tried loading <" + RESOURCE_PREFIX + "> for locale <" + locale + "> but had to fall back to default locale <" + defaultLocale + ">"); - } - - if(!menuTitles.getLocale().equals(locale)) { - LOGGER.warn("Tried loading <" + MENU_RESOURCE_PREFIX + "> for locale <" + locale + "> but had to fall back to default locale <" + defaultLocale + ">"); - } - - if(!intMessages.getLocale().equals(locale)) { - LOGGER.warn("Tried loading <" + INTEGRITY_RESOURCE_PREFIX + "> for locale <" + locale + "> but had to fall back to default locale <" + defaultLocale + ">"); + LOGGER.warn("Bundle for locale <" + locale + "> not found. Falling back to system locale <" + defaultLocale + ">"); } } catch(MissingResourceException e) { - LOGGER.warn("Fallback to system locale <" + defaultLocale + "> failed, using locale instead"); + LOGGER.warn("Bundle for locale <" + locale + "> not found. Fallback to system locale <" + defaultLocale + "> failed, using locale instead"); locale = new Locale("en"); messages = ResourceBundle.getBundle(RESOURCE_PREFIX, locale, new EncodingControl("UTF-8")); menuTitles = ResourceBundle.getBundle(MENU_RESOURCE_PREFIX, locale, new EncodingControl("UTF-8")); intMessages = ResourceBundle.getBundle(INTEGRITY_RESOURCE_PREFIX, locale, new EncodingControl("UTF-8")); } finally { + // Set consistent VM locales Locale.setDefault(locale); javax.swing.JComponent.setDefaultLocale(locale); }