Author: toad
Date: 2007-05-09 20:40:34 +0000 (Wed, 09 May 2007)
New Revision: 13177
Modified:
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
Almost there...
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-05-09
20:29:09 UTC (rev 13176)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-05-09
20:40:34 UTC (rev 13177)
@@ -783,4 +783,13 @@
UpdatedVersionAvailableUserAlert.fetchingNewNode=Your node is currently
downloading a new version of Freenet (node version ${nodeVersion}).
UpdatedVersionAvailableUserAlert.fetchingNewExt=Your node is currently
downloading a new version of Freenet (extra jar version ${extVersion}).
UpdatedVersionAvailableUserAlert.updateASAPQuestion=Would you like the node to
automatically restart as soon as it has downloaded the update?
+UserAlertManager.criticalErrorCountLabel=Critical Errors:
+UserAlertManager.errorCountLabel=Errors:
+UserAlertManager.warningCountLabel=Warnings:
+UserAlertManager.minorCountLabel=Minor:
+UserAlertManager.totalLabel=Total:
+UserAlertManager.alertsTitle=Outstanding alerts
+UserAlertManager.alertsOnHomepage= | See them on ${link}the Freenet
Homepage${/link}.
+PluginManager.pluginReqNewerJVMTitle=Later JVM required by plugin ${name}.
+PluginManager.pluginReqNewerJVM=The plugin ${name} seems to require a later
JVM. Please install at least Sun java 1.5, or remove the plugin.
End
\ No newline at end of file
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2007-05-09 20:29:09 UTC (rev 13176)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2007-05-09 20:40:34 UTC (rev 13177)
@@ -8,6 +8,7 @@
import java.util.HashSet;
import freenet.support.HTMLNode;
+import freenet.l10n.L10n;
import freenet.node.NodeClientCore;
/**
@@ -137,30 +138,30 @@
boolean separatorNeeded = false;
StringBuffer alertSummaryString = new StringBuffer(1024);
if (numberOfCriticalError != 0) {
- alertSummaryString.append("Critical Error:
").append(numberOfCriticalError);
+
alertSummaryString.append(l10n("criticalErrorCountLabel")).append('
').append(numberOfCriticalError);
separatorNeeded = true;
}
if (numberOfError != 0) {
if (separatorNeeded)
alertSummaryString.append(" | ");
- alertSummaryString.append("Error:
").append(numberOfError);
+
alertSummaryString.append(l10n("errorCountLabel")).append('
').append(numberOfError);
separatorNeeded = true;
}
if (numberOfWarning != 0) {
if (separatorNeeded)
alertSummaryString.append(" | ");
- alertSummaryString.append("Warning:
").append(numberOfWarning);
+
alertSummaryString.append(l10n("warningLabel")).append('
').append(numberOfWarning);
separatorNeeded = true;
}
if (numberOfMinor != 0) {
if (separatorNeeded)
alertSummaryString.append(" | ");
- alertSummaryString.append("Minor:
").append(numberOfMinor);
+ alertSummaryString.append(l10n("minorLabel")).append('
').append(numberOfMinor);
separatorNeeded = true;
}
if (separatorNeeded)
alertSummaryString.append(" | ");
- alertSummaryString.append("Total: ").append(totalNumber);
+
alertSummaryString.append(l10n("totalLabel")).append(totalNumber);
HTMLNode summaryBox = null;
@@ -172,12 +173,16 @@
summaryBox = new HTMLNode("div", "class", "infobox
infobox-warning");
else if (highestLevel <= UserAlert.MINOR)
summaryBox = new HTMLNode("div", "class", "infobox
infobox-information");
- summaryBox.addChild("div", "class", "infobox-header",
"Outstanding alerts");
+ summaryBox.addChild("div", "class", "infobox-header",
l10n("alerts"));
HTMLNode summaryContent = summaryBox.addChild("div", "class",
"infobox-content", alertSummaryString.toString());
- summaryContent.addChild("#", " | See them on ");
- summaryContent.addChild("a", "href", "/", "the Freenet FProxy
Homepage");
- summaryContent.addChild("#", ".");
+ L10n.addL10nSubstitution(summaryContent,
"UserAlertManager.alertsOnHomepage",
+ new String[] { "link", "/link" },
+ new String[] { "<a href=\"/\">", "</a>" });
return summaryBox;
}
+ private String l10n(String key) {
+ return L10n.getString("UserAlertManager."+key);
+ }
+
}
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2007-05-09
20:29:09 UTC (rev 13176)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2007-05-09
20:40:34 UTC (rev 13177)
@@ -21,6 +21,7 @@
import freenet.config.InvalidConfigValueException;
import freenet.config.SubConfig;
+import freenet.l10n.L10n;
import freenet.node.Node;
import freenet.node.NodeClientCore;
import freenet.node.useralerts.SimpleUserAlert;
@@ -137,14 +138,19 @@
if(jvmVersion.startsWith("1.4.") ||
jvmVersion.equals("1.4")) {
System.err.println("Plugin "+filename+" appears
to require a later JVM");
Logger.error(this, "Plugin "+filename+" appears
to require a later JVM");
- core.alerts.register(new SimpleUserAlert(true,
"Later JVM required by plugin "+filename,
- "The plugin "+filename+" seems
to require a later JVM. Please install at least Sun java 1.5, or remove the
plugin.",
+ core.alerts.register(new SimpleUserAlert(true,
+ l10n("pluginReqNewerJVMTitle",
"name", filename),
+ l10n("pluginReqNewerJVM",
"name", filename),
UserAlert.ERROR));
}
}
if(store) core.storeConfig();
}
+ private String l10n(String key, String pattern, String value) {
+ return L10n.getString("PluginManager."+key, pattern, value);
+ }
+
private void registerToadlet(FredPlugin pl){
//toadletList.put(e.getStackTrace()[1].getClass().toString(),
pl);
synchronized (toadletList) {
