diff options
author | tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7> | 2013-04-10 19:21:33 +0000 |
---|---|---|
committer | tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7> | 2013-04-10 19:21:33 +0000 |
commit | 7acc653f1982f2f839aadfe49f4277b160c94390 (patch) | |
tree | 242c03df43d1699fec03769c522d33205f99d38b /pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java | |
parent | 275516dd3f8f8a97d9283e0f7024e413f2325d63 (diff) | |
download | mocca-7acc653f1982f2f839aadfe49f4277b160c94390.tar.gz mocca-7acc653f1982f2f839aadfe49f4277b160c94390.tar.bz2 mocca-7acc653f1982f2f839aadfe49f4277b160c94390.zip |
Only use configured locales
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@279 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java')
-rw-r--r-- | pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java index 77e2f764..b17e168a 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Messages.java @@ -41,12 +41,25 @@ public class Messages { //private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle // .getBundle(BUNDLE_NAME); - private static Locale currentLocale = Locale.getDefault(); + private static Locale currentLocale = getDefaultLocale(); private Messages() { } /** + * Get the closest match to the system default Locale out of the supported locales + * @return the default locale + */ + public static Locale getDefaultLocale() { + Locale ld = Locale.getDefault(); + for (Locale l : Constants.SUPPORTED_LOCALES) { + if (l.equals(ld) || l.getLanguage().equals(ld.getLanguage())) + return l; + } + return Constants.SUPPORTED_LOCALES[0]; + } + + /** * Sets the currently used locals * @param locale */ @@ -56,9 +69,11 @@ public class Messages { private static ResourceBundle getBundle(Locale locale) { if(!bundles.containsKey(locale)) { + log.debug("Loading resource bundle for " + locale); //$NON-NLS-1$ ResourceBundle tmp = null; try { tmp = ResourceBundle.getBundle(BUNDLE_NAME, locale); + log.debug("Received bundle for " + tmp.getLocale()); //$NON-NLS-1$ } catch(Exception e) { log.error("NO RESOURCE BUNDLE FOR " + locale.toString(), e); //$NON-NLS-1$ tmp = ResourceBundle.getBundle(BUNDLE_NAME); |