Author: nextgens
Date: 2007-06-29 22:11:50 +0000 (Fri, 29 Jun 2007)
New Revision: 13833
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Revert part of r13824 (only show translation link if language is non-english):
* never show the translation toadlet in the menu
* add a link to it on the ConfigToadlet
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-06-29
20:52:07 UTC (rev 13832)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-06-29
22:11:50 UTC (rev 13833)
@@ -133,6 +133,7 @@
if(advancedModeEnabled){
HTMLNode navigationBar =
ctx.getPageMaker().getInfobox("navbar", l10n("configNavTitle"));
HTMLNode navigationContent =
ctx.getPageMaker().getContentNode(navigationBar).addChild("ul");
+ navigationContent.addChild("a", "href",
TranslationToadlet.TOADLET_URL, l10n("contributeTranslation"));
HTMLNode navigationTable =
navigationContent.addChild("table", "class", "config_navigation");
HTMLNode navigationTableRow =
navigationTable.addChild("tr");
HTMLNode nextTableCell = navigationTableRow;
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-06-29
20:52:07 UTC (rev 13832)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-06-29
22:11:50 UTC (rev 13833)
@@ -621,7 +621,7 @@
server.register(browsertTestToadlet, "/test/", true,
false);
TranslationToadlet translationToadlet = new
TranslationToadlet(client, core);
- server.register(translationToadlet,
TranslationToadlet.TOADLET_URL, true, l10n("translationTitle"),
l10n("translation"), true, translationToadlet);
+ server.register(translationToadlet,
TranslationToadlet.TOADLET_URL, true, true);
FirstTimeWizardToadlet firstTimeWizardToadlet = new
FirstTimeWizardToadlet(client, node);
server.register(firstTimeWizardToadlet,
FirstTimeWizardToadlet.TOADLET_URL, true, false);
Modified: trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2007-06-29 20:52:07 UTC (rev 13832)
+++ trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2007-06-29 22:11:50 UTC (rev 13833)
@@ -22,7 +22,7 @@
*
* @author Florent Daignière <nextgens at freenetproject.org>
*/
-public class TranslationToadlet extends Toadlet implements LinkEnabledCallback
{
+public class TranslationToadlet extends Toadlet {
public static final String TOADLET_URL = "/translation/";
private final NodeClientCore core;
private static final SimpleFieldSet DEFAULT_TRANSLATION =
L10n.getDefaultLanguageTranslation();
@@ -257,8 +257,4 @@
private String l10n(String key, String pattern, String value) {
return L10n.getString("TranslationToadlet."+key, new String[] {
pattern }, new String[] { value });
}
-
- public boolean isEnabled() {
- return
!L10n.FALLBACK_DEFAULT.equals(L10n.getSelectedLanguage());
- }
}
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-06-29
20:52:07 UTC (rev 13832)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-06-29
22:11:50 UTC (rev 13833)
@@ -60,6 +60,7 @@
ConfigToadlet.appliedTitle=Configuration Applied
ConfigToadlet.apply=Apply
ConfigToadlet.configNavTitle=Configuration Navigation
+ConfigToadlet.contributeTranslation=Contribute to the translation
ConfigToadlet.defaultIs=The default for that configuration option is:
'${default}'.
ConfigToadlet.fullTitle=Freenet Node Configuration of ${name}
ConfigToadlet.possibilitiesTitle=Your Possibilities
@@ -241,8 +242,6 @@
FProxyToadlet.sizeUnknown=Size: unknown
FProxyToadlet.stats=view statistics
FProxyToadlet.statsTitle=Statistics
-FProxyToadlet.translation=helper to translate the node's interface into your
native language
-FProxyToadlet.translationTitle=Translation
FProxyToadlet.unableToRetrieve=Freenet was unable to retrieve this file.
FProxyToadlet.unknownMIMEType=MIME type: unknown
FProxyToadlet.welcome=homepage
