Author: nextgens
Date: 2007-04-22 15:17:42 +0000 (Sun, 22 Apr 2007)
New Revision: 12868
Modified:
trunk/freenet/src/freenet/l10n/L10n.java
Log:
Implement a functionnality suggested by cooo :
some keys might be translated the same way as in english... so it makes sense
to override them anyway.
Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java 2007-04-22 15:02:23 UTC (rev
12867)
+++ trunk/freenet/src/freenet/l10n/L10n.java 2007-04-22 15:17:42 UTC (rev
12868)
@@ -102,14 +102,15 @@
key = key.trim();
value = value.trim();
synchronized (sync) {
- // If there is no need to keep it in the override,
remove it
- if("".equals(value) ||
L10n.getString(key).equals(value)) {
+ // Is the override already declared ? if not, create it.
+ if(translationOverride == null)
+ translationOverride = new SimpleFieldSet(false);
+
+ // 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)) {
translationOverride.removeValue(key);
} else {
- // Is the override already declared ? if not,
create it.
- if(translationOverride == null)
- translationOverride = new
SimpleFieldSet(false);
-
// Set the value of the override
translationOverride.putOverwrite(key, value);
Logger.normal("L10n", "Got a new translation
key: set the Override!");
