Changeset 112 in josm

Timestamp:

2006-07-17T00:18:11+02:00 (18 years ago)

Author:

imi

Message:

fixed exception for missing locale

File:

• src/org/openstreetmap/josm/tools/I18n.java (modified) (2 diffs)

src/org/openstreetmap/josm/tools/I18n.java

@@ -1 +1 @@
 package org.openstreetmap.josm.tools;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
 
 import org.openstreetmap.josm.Main;
@@ -10 +14 @@
  */
 public class I18n {
-        private static org.xnap.commons.i18n.I18n i18n = I18nFactory.getI18n(Main.class);
+        private static org.xnap.commons.i18n.I18n i18n;
+        
+        static {
+                try {
+                i18n = I18nFactory.getI18n(Main.class);
+        } catch (MissingResourceException e) {
+                System.out.println("Locale '"+Locale.getDefault().getLanguage()+"' not found. Using default.");
+        }
+        }
         
         public static String tr(String text, Object... objects) {
+                if (i18n == null)
+                        return MessageFormat.format(text, objects);
                 return i18n.tr(text, objects);
         }
 
         public static String tr(String text) {
+                if (i18n == null)
+                        return text;
                 return i18n.tr(text);
         }
 
         public static String trn(String text, String pluralText, long n, Object... objects) {
+                if (i18n == null)
+                        return n == 1 ? tr(text, objects) : tr(pluralText, objects);
                 return i18n.trn(text, pluralText, n, objects);
         }
 
         public static String trn(String text, String pluralText, long n) {
+                if (i18n == null)
+                        return n == 1 ? tr(text) : tr(pluralText);
                 return i18n.trn(text, pluralText, n);
         }