Merge "upd: fixes wording"

[gigi.git] / src / org / cacert / gigi / localisation / Language.java

diff --git a/src/org/cacert/gigi/localisation/Language.java b/src/org/cacert/gigi/localisation/Language.java
index 6a48f5aaacb1cf0ce785ffdb6ee7f4729bb7b8c9..4caaa79beb698533b0bb8de4f26f4aeb12945a67 100644 (file)
--- a/src/org/cacert/gigi/localisation/Language.java
+++ b/src/org/cacert/gigi/localisation/Language.java
@@ -99,6 +99,9 @@ public class Language {
     }
 
     public String getTranslation(String text) {
+        if (text == null || text.equals("")) {
+            return text;
+        }
         String string = translations.get(text);
         if (string == null || string.equals("")) {
             return text;
@@ -112,26 +115,23 @@ public class Language {
         if ( !file.exists()) {
             return null;
         }
-        Language lang = langs.get(locale.toString());
-        if (lang == null) {
-            synchronized (Language.class) {
-                lang = langs.get(locale.toString());
-                if (lang != null) {
-                    return lang;
-                }
-                try {
-                    lang = new Language(locale);
-                    langs.put(locale.toString(), lang);
-                } catch (ParserConfigurationException e) {
-                    e.printStackTrace();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } catch (SAXException e) {
-                    e.printStackTrace();
-                }
+        synchronized (Language.class) {
+            Language lang = langs.get(locale.toString());
+            if (lang != null) {
+                return lang;
+            }
+            try {
+                lang = new Language(locale);
+                langs.put(locale.toString(), lang);
+            } catch (ParserConfigurationException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (SAXException e) {
+                e.printStackTrace();
             }
+            return lang;
         }
-        return lang;
     }
 
     public Locale getLocale() {