[freenet-cvs] r21417 - trunk/freenet/src/freenet/l10n

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-07-26 06:23:42 +0000 (Sat, 26 Jul 2008)
New Revision: 21417

Modified:
   trunk/freenet/src/freenet/l10n/L10n.java
Log:
remove only if the string in the *orginal*/defualt translation
(don't remove if it is only in the override file)

Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java    2008-07-26 06:23:18 UTC (rev 
21416)
+++ trunk/freenet/src/freenet/l10n/L10n.java    2008-07-26 06:23:42 UTC (rev 
21417)
@@ -116,7 +116,8 @@

                        // If there is no need to keep it in the override, 
remove it...
                        // unless the original/default is the same as the 
translation
-                       if(("".equals(value) || 
L10n.getString(key).equals(value)) && 
!L10n.getDefaultString(key).equals(value)) {
+                       if (("".equals(value) || 
value.equals(currentTranslation.get(key)))
+                               && !L10n.getDefaultString(key).equals(value)) {
                                translationOverride.removeValue(key);
                        } else {
                                value = value.replaceAll("(\r|\n|\t)+", "");