JAL-3187 applet alignFrame needs new api method

[jalview.git] / src / jalview / util / MessageManager.java

diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java
index 2f993ef..2efaeb6 100644 (file)
--- a/src/jalview/util/MessageManager.java
+++ b/src/jalview/util/MessageManager.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -38,8 +38,8 @@ public class MessageManager
 
   private static ResourceBundle rb;
 
-  private static Logger log = Logger.getLogger(MessageManager.class
-          .getCanonicalName());
+  private static Logger log = Logger
+          .getLogger(MessageManager.class.getCanonicalName());
 
   private static Locale loc;
 
@@ -92,12 +92,25 @@ public class MessageManager
 
   public static String formatMessage(String key, Object... params)
   {
-    return MessageFormat.format(rb.getString(key), params);
+    try
+    {
+      return MessageFormat.format(rb.getString(key), params);
+    } catch (Exception e)
+    {
+      log.warning("I18N missing: " + loc + "\t" + key);
+
+    }
+    String value = "[missing key] " + key + "";
+    for (Object p : params)
+    {
+      value += " '" + p.toString() + "'";
+    }
+    return value;
   }
 
   public static String formatMessage(String key, String[] params)
   {
-    return MessageFormat.format(rb.getString(key), (Object[]) params);
+    return formatMessage(rb.getString(key), (Object[]) params);
   }
 
   /**
@@ -119,8 +132,8 @@ public class MessageManager
       name = rb.getString(smkey);
     } catch (Exception x)
     {
-      log.finest("I18N missing key with root " + keyroot + ": " + loc
-              + "\t" + smkey);
+      log.finest("I18N missing key with root " + keyroot + ": " + loc + "\t"
+              + smkey);
     }
     return name;
   }