Version 16, February 2014

[GpsPrune.git] / tim / prune / I18nManager.java

diff --git a/tim/prune/I18nManager.java b/tim/prune/I18nManager.java
index 80be52b44f60aa795dbe80039f279334baae7a69..24a4fde41ab2a73288dcdb7975c9c7791f54cf47 100644 (file)
--- a/tim/prune/I18nManager.java
+++ b/tim/prune/I18nManager.java
@@ -2,6 +2,7 @@ package tim.prune;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.MissingResourceException;
@@ -35,14 +36,19 @@ public abstract class I18nManager
                EnglishTexts = ResourceBundle.getBundle(BUNDLE_NAME, BACKUP_LOCALE);
 
                // Get bundle for selected locale, if any
-               if (inLocale != null)
+               try
                {
-                       LocalTexts = ResourceBundle.getBundle(BUNDLE_NAME, inLocale);
+                       if (inLocale != null)
+                       {
+                               LocalTexts = ResourceBundle.getBundle(BUNDLE_NAME, inLocale);
+                       }
+                       else
+                       {
+                               // locale is null so just use the system default
+                               LocalTexts = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
+                       }
                }
-               else
-               {
-                       // locale is null so just use the system default
-                       LocalTexts = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
+               catch (MissingResourceException mre) { // ignore error, default to english
                }
        }
 
@@ -50,21 +56,26 @@ public abstract class I18nManager
        /**
         * Add a language file
         * @param inFilename filename of file
+        * @throws FileNotFoundException if load failed
         */
-       public static void addLanguageFile(String inFilename)
+       public static void addLanguageFile(String inFilename) throws FileNotFoundException
        {
                FileInputStream fis = null;
+               boolean fileLoaded = false;
                try
                {
                        File file = new File(inFilename);
                        ExternalPropsFile = new Properties();
                        fis = new FileInputStream(file);
                        ExternalPropsFile.load(fis);
+                       fileLoaded = true; // everything worked
                }
                catch (IOException ioe) {}
                finally { try { fis.close();
                        } catch (Exception e) {}
                }
+               // complain if file wasn't loaded, by throwing a filenotfound exception
+               if (!fileLoaded) throw new FileNotFoundException();
        }
 
 
@@ -75,22 +86,19 @@ public abstract class I18nManager
         */
        public static String getText(String inKey)
        {
-               String value = null;
                // look in external props file if available
                if (ExternalPropsFile != null)
                {
-                       value = ExternalPropsFile.getProperty(inKey);
-                       if (value != null && !value.equals(""))
-                               return value;
+                       String extText = ExternalPropsFile.getProperty(inKey);
+                       if (extText != null) return extText;
                }
                // look in extra texts if available
                if (LocalTexts != null)
                {
                        try
                        {
-                               value = LocalTexts.getString(inKey);
-                               if (value != null && !value.equals(""))
-                                       return value;
+                               String localText = LocalTexts.getString(inKey);
+                               if (localText != null) return localText;
                        }
                        catch (MissingResourceException mre) {}
                }
@@ -99,13 +107,30 @@ public abstract class I18nManager
                {
                        try
                        {
-                               value = EnglishTexts.getString(inKey);
-                               if (value != null && !value.equals(""))
-                                       return value;
+                               String engText = EnglishTexts.getString(inKey);
+                               if (engText != null) return engText;
                        }
                        catch (MissingResourceException mre) {}
                }
                // return the key itself
                return inKey;
        }
+
+       /**
+        * Lookup the given key and return the associated text, formatting with the number
+        * @param inKey key to lookup (text should contain a %d)
+        * @param inNumber number to substitute into the %d
+        * @return associated text, or the key if not found
+        */
+       public static String getTextWithNumber(String inKey, int inNumber)
+       {
+               String localText = getText(inKey);
+               try
+               {
+                       localText = String.format(localText, inNumber);
+               }
+               catch (Exception e)
+               {} // printf formatting didn't work, maybe the placeholders are wrong?
+               return localText;
+       }
 }