[Jmol-commits] SF.net SVN: jmol:[16266] branches/android/src/org/jmol/i18n/GT.java

[<ha...@us...>]

Revision: 16266
          http://jmol.svn.sourceforge.net/jmol/?rev=16266&view=rev
Author:   hansonr
Date:     2011-10-06 11:52:51 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
# October 6, 2011 -- merge with Jmol 12.3.1

Modified Paths:
--------------
    branches/android/src/org/jmol/i18n/GT.java

Modified: branches/android/src/org/jmol/i18n/GT.java
===================================================================
--- branches/android/src/org/jmol/i18n/GT.java	2011-10-06 11:52:25 UTC (rev 16265)
+++ branches/android/src/org/jmol/i18n/GT.java	2011-10-06 11:52:51 UTC (rev 16266)
@@ -152,6 +152,8 @@
       new Language("fi",    GT._("Finnish"),              "Suomi",                true),
       new Language("fo",    GT._("Faroese"),              "Føroyskt",             false),
       new Language("fr",    GT._("French"),               "Français",             true),
+      new Language("fy",    GT._("Frisian"),              "Frysk",                false),
+      new Language("gl",    GT._("Galician"),             "Galego",               false),
       new Language("hr",    GT._("Croatian"),             "Hrvatski",             false),
       new Language("hu",    GT._("Hungarian"),            "Magyar",               true),
       new Language("hy",    GT._("Armenian"),             "Հայերեն",                false),
@@ -422,19 +424,20 @@
   }
 
   private String getString(String string) {
-    if (!doTranslate || translationResourcesCount == 0)
-      return string;
-    for (int bundle = 0; bundle < translationResourcesCount; bundle++) {
-      try {
-        String trans = translationResources[bundle].getString(string);
-        return trans;
-      } catch (MissingResourceException e) {
-        // Normal
-      }
+    if (doTranslate) {
+      for (int bundle = translationResourcesCount; --bundle >= 0;)
+        try {
+          return translationResources[bundle].getString(string);
+        } catch (MissingResourceException e) {
+          // Normal
+        }
+      if (Logger.debugging)
+        Logger.info("No trans, using default: " + string);
     }
-    if (Logger.debugging) {
-      Logger.info("No trans, using default: " + string);
-    }
+    if (string.startsWith("["))
+      string = string.substring(string.indexOf("]") + 1);
+    else if (string.endsWith("]"))
+      string = string.substring(0, string.indexOf("["));
     return string;
   }
 
@@ -470,11 +473,4 @@
     return msg;   
   }
 
-  /**
-   * 
-   * @param languagePath UNUSED
-   */
-  public static void setLanguagePath(String languagePath) {
-    //GT.languagePath = languagePath;
-  }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.