X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FMessageManager.java;fp=src%2Fjalview%2Futil%2FMessageManager.java;h=2a0761603a0ec1bd2cc99adc763f600d08fa5a71;hb=586ade46bdcd05ff028a1cff82c3c527326d28ec;hp=bb94566b7848361881b0c879af7f31d9bb0b827d;hpb=adcef27f5747b4e70e89a56c3735bc3afb8ce9bf;p=jalview.git diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java index bb94566..2a07616 100644 --- a/src/jalview/util/MessageManager.java +++ b/src/jalview/util/MessageManager.java @@ -57,8 +57,7 @@ public class MessageManager // Locale.setDefault(loc); /* Getting messages for GV */ log.info("Getting messages for lang: " + loc); - Control control = Control.getControl(Control.FORMAT_PROPERTIES); - rb = ResourceBundle.getBundle("lang.Messages", loc, control); + rb = ResourceBundle.getBundle("lang.Messages", Platform.getLocaleOrNone(loc), Control.getControl(Control.FORMAT_PROPERTIES)); // if (log.isLoggable(Level.FINEST)) // { // // this might take a while, so we only do it if it will be shown @@ -94,7 +93,7 @@ public class MessageManager } catch (Exception e) { String msg = "I18N missing: " + loc + "\t" + key; - logWarning(key, msg); + logWarning(key, msg); } return value; } @@ -169,8 +168,8 @@ public class MessageManager } catch (Exception x) { String msg = "I18N missing key with root " + keyroot + ": " + loc + "\t" - + smkey; - logWarning(smkey, msg); + + smkey; + logWarning(smkey, msg); } return name; } @@ -183,10 +182,10 @@ public class MessageManager */ private static void logWarning(String key, String msg) { - if (!reportedMissing.contains(key)) - { + if (!reportedMissing.contains(key)) + { reportedMissing.add(key); - log.info(msg); - } + log.info(msg); + } } }