X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FMessageManager.java;h=3dace12469530cb2170acb24b42020cf6284e69f;hb=b7791df75a2e535cfe438e85b101918eedeb71dc;hp=71fc47ab1f59d5861dbc921082373791f0632820;hpb=6c52a1ff889b6320dd8b3767c77b0555f818352f;p=jalview.git diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java index 71fc47a..3dace12 100644 --- a/src/jalview/util/MessageManager.java +++ b/src/jalview/util/MessageManager.java @@ -23,6 +23,7 @@ package jalview.util; import java.text.MessageFormat; import java.util.Locale; import java.util.ResourceBundle; +import java.util.ResourceBundle.Control; //import java.util.logging.Level; //import java.util.logging.Logger; @@ -56,7 +57,8 @@ public class MessageManager // Locale.setDefault(loc); /* Getting messages for GV */ log.info("Getting messages for lang: " + loc); - rb = ResourceBundle.getBundle("lang.Messages", loc); + Control control = Control.getControl(Control.FORMAT_PROPERTIES); + rb = ResourceBundle.getBundle("lang.Messages", loc, control); // if (log.isLoggable(Level.FINEST)) // { // // this might take a while, so we only do it if it will be shown @@ -96,20 +98,20 @@ public class MessageManager public static String formatMessage(String key, Object... params) { - return MessageFormat.format(rb.getString(key), params); + return MessageFormat.format(getString(key), params); } public static String formatMessage(String key, String[] params) { - return MessageFormat.format(rb.getString(key), (Object[]) params); + return MessageFormat.format(getString(key), (Object[]) params); } /** - * lookup and return a key given a root and a human-readable(ish) name that + * Looks up and returns a key given a root and a human-readable(ish) name that * when combined might resolve to an i18n string. If the key doesn't resolve, - * then name is returned.if the key doesn't exist. Use this for - * programatically constructed keys that have have a human readable - * alternative used in the program (e.g. BLOSUM62 and label.score_blosum62) + * then name is returned. Use this for programmatically constructed keys that + * have a human readable alternative used in the program (e.g. BLOSUM62 and + * label.score_blosum62). * * @param keyroot * @param name