[freenet-cvs] r24949 - trunk/freenet/src/freenet/clients/http

[toad]

Author: toad
Date: 2009-01-06 23:28:48 +0000 (Tue, 06 Jan 2009)
New Revision: 24949

Modified:
   trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
Log:
Fix some links in the translation toadlet


Modified: trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/TranslationToadlet.java      
2009-01-06 23:24:37 UTC (rev 24948)
+++ trunk/freenet/src/freenet/clients/http/TranslationToadlet.java      
2009-01-06 23:28:48 UTC (rev 24949)
@@ -159,12 +159,12 @@
                HTMLNode translationNode = contentNode.addChild("div", "class", 
"translation");
                HTMLNode translationHeaderNode = translationNode.addChild("p");
                translationHeaderNode.addChild("#", 
l10n("contributingToLabelWithLang", "lang", 
L10n.getSelectedLanguage().fullName));
-               translationHeaderNode.addChild("a", "href", 
TOADLET_URL+"?getOverrideTranlationFile").addChild("#", 
l10n("downloadTranslationsFile"));
+               translationHeaderNode.addChild("a", "href", 
ctx.fixLink(TOADLET_URL+"?getOverrideTranlationFile")).addChild("#", 
l10n("downloadTranslationsFile"));
                translationHeaderNode.addChild("#", " ");
                if(showEverything)
-                       translationHeaderNode.addChild("a", "href", 
TOADLET_URL+"?toTranslateOnly").addChild("#", l10n("hideAlreadyTranslated"));
+                       translationHeaderNode.addChild("a", "href", 
ctx.fixLink(TOADLET_URL+"?toTranslateOnly")).addChild("#", 
l10n("hideAlreadyTranslated"));
                else
-                       translationHeaderNode.addChild("a", "href", 
TOADLET_URL).addChild("#", l10n("showEverything"));
+                       translationHeaderNode.addChild("a", "href", 
ctx.fixLink(TOADLET_URL)).addChild("#", l10n("showEverything"));
                HTMLNode legendTable = translationNode.addChild("table", 
"class", "translation");
                
                HTMLNode legendRow = legendTable.addChild("tr");
@@ -188,7 +188,7 @@
                                                L10n.getDefaultString(key)
                                );
 
-                               contentRow.addChild("td", "class", 
"translation-new").addChild(_setOrRemoveOverride(key, isOverriden, 
showEverything));
+                               contentRow.addChild("td", "class", 
"translation-new").addChild(_setOrRemoveOverride(key, isOverriden, 
showEverything, ctx));
                        }
                }
                
@@ -245,7 +245,7 @@
        
        private void redirectTo(ToadletContext ctx, String target) throws 
ToadletContextClosedException, IOException {
                MultiValueTable<String, String> headers = new 
MultiValueTable<String, String>();
-               headers.put("Location", target);
+               headers.put("Location", ctx.fixLink(target));
                ctx.sendReplyHeaders(302, "Found", headers, null, 0);
                return;
        }
@@ -255,18 +255,18 @@
                return "GET, POST";
        }
        
-       private HTMLNode _setOrRemoveOverride(String key, boolean isOverriden, 
boolean showEverything) {
+       private HTMLNode _setOrRemoveOverride(String key, boolean isOverriden, 
boolean showEverything, LinkFixer fixer) {
                String value = L10n.getString(key, true);
                
                HTMLNode translationField = new HTMLNode("span", "class", 
isOverriden ? "translate_d" : "translate_it");
                if(value == null) {
                        translationField.addChild("#", 
L10n.getDefaultString(key));
-                       translationField.addChild("a", "href", 
TranslationToadlet.TOADLET_URL+"?translate=" + key + (showEverything ? "" : 
"&toTranslateOnly")).addChild("small", l10n("bracketTranslateIt"));
+                       translationField.addChild("a", "href", 
fixer.fixLink(TranslationToadlet.TOADLET_URL+"?translate=" + key + 
(showEverything ? "" : "&toTranslateOnly"))).addChild("small", 
l10n("bracketTranslateIt"));
                } else {
                        translationField.addChild("#", L10n.getString(key));
-                       translationField.addChild("a", "href", 
TranslationToadlet.TOADLET_URL+"?translate=" + key + (showEverything ? "" : 
"&toTranslateOnly")).addChild("small", l10n("bracketUpdateTranslation"));
+                       translationField.addChild("a", "href", 
fixer.fixLink(TranslationToadlet.TOADLET_URL+"?translate=" + key + 
(showEverything ? "" : "&toTranslateOnly"))).addChild("small", 
l10n("bracketUpdateTranslation"));
                        if(isOverriden)
-                               translationField.addChild("a", "href", 
TranslationToadlet.TOADLET_URL+"?remove=" + key + (showEverything ? "" : 
"&toTranslateOnly")).addChild("small", l10n("bracketRemoveOverride"));
+                               translationField.addChild("a", "href", 
fixer.fixLink(TranslationToadlet.TOADLET_URL+"?remove=" + key + (showEverything 
? "" : "&toTranslateOnly"))).addChild("small", l10n("bracketRemoveOverride"));
                }
                
                return translationField;

_______________________________________________
cvs mailing list
cvs@freenetproject.org
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs