[freenet-cvs] r12981 - in trunk/freenet/src/freenet: clients/http l10n

[t...@freenetproject.org]

Author: toad
Date: 2007-04-26 12:58:09 +0000 (Thu, 26 Apr 2007)
New Revision: 12981

Modified:
   trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
   trunk/freenet/src/freenet/l10n/L10n.java
Log:
Don't show "Remove the translation override" if there is no translation 
override to remove

Modified: trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/TranslationToadlet.java      
2007-04-26 12:39:13 UTC (rev 12980)
+++ trunk/freenet/src/freenet/clients/http/TranslationToadlet.java      
2007-04-26 12:58:09 UTC (rev 12981)
@@ -226,7 +226,8 @@
                } else {
                        translationField.addChild("#", L10n.getString(key));
                        translationField.addChild("a", "href", 
TranslationToadlet.TOADLET_URL+"?translate=" + key).addChild("small", " (update 
the translation)");
-                       translationField.addChild("a", "href", 
TranslationToadlet.TOADLET_URL+"?remove=" + key).addChild("small", " (Remove 
the translation override!)");
+                       if(L10n.isOverridden(key))
+                               translationField.addChild("a", "href", 
TranslationToadlet.TOADLET_URL+"?remove=" + key).addChild("small", " (Remove 
the translation override!)");
                }

                return translationField;

Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java    2007-04-26 12:39:13 UTC (rev 
12980)
+++ trunk/freenet/src/freenet/l10n/L10n.java    2007-04-26 12:58:09 UTC (rev 
12981)
@@ -341,4 +341,11 @@

         return result;
     }
+
+       public static boolean isOverridden(String key) {
+               synchronized(sync) {
+                       if(translationOverride == null) return false;
+                       return translationOverride.get(key) != null; 
+               }
+       }
 }