From f8e41805cd23482f89eff4ae5e57578098ae12ab Mon Sep 17 00:00:00 2001 From: BobHanson Date: Mon, 8 Jun 2020 16:58:32 -0500 Subject: [PATCH] LocaleOrNone - MessageManager --- src/jalview/util/MessageManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java index 823fcc3..880252e 100644 --- a/src/jalview/util/MessageManager.java +++ b/src/jalview/util/MessageManager.java @@ -56,9 +56,13 @@ public class MessageManager try { /* Getting messages for GV */ + // BH 2020.0-6.05 using new Locale("") to avoid unnecessary check for "en" + // here; works in Java as well, but not implementing that. 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); // if (log.isLoggable(Level.FINEST)) // { // // this might take a while, so we only do it if it will be shown -- 1.7.10.2