From a5cd0bdd3fa2ce5a897563b0c5f44e0da9acaff8 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 23 Oct 2009 13:55:44 +0000 Subject: [PATCH] - Rename cssHelper to intl for ease of tagging - configui.jsp post-prop fixup --- apps/routerconsole/java/bundle-messages.sh | 6 ++-- apps/routerconsole/jsp/configadvanced.jsp | 8 +++--- apps/routerconsole/jsp/configclients.jsp | 12 ++++---- apps/routerconsole/jsp/configkeyring.jsp | 18 ++++++------ apps/routerconsole/jsp/configlogging.jsp | 20 ++++++------- apps/routerconsole/jsp/configpeer.jsp | 18 ++++++------ apps/routerconsole/jsp/configservice.jsp | 14 +++++----- apps/routerconsole/jsp/configstats.jsp | 22 +++++++-------- apps/routerconsole/jsp/configtunnels.jsp | 4 +-- apps/routerconsole/jsp/configui.jsp | 4 +-- apps/routerconsole/jsp/configupdate.jsp | 28 +++++++++---------- apps/routerconsole/jsp/css.jsp | 12 ++++---- apps/routerconsole/jsp/error.jsp | 6 ++-- apps/routerconsole/jsp/graphs.jsp | 4 +-- apps/routerconsole/jsp/index.jsp | 4 +-- apps/routerconsole/jsp/jobs.jsp | 4 +-- apps/routerconsole/jsp/logs.jsp | 8 +++--- apps/routerconsole/jsp/netdb.jsp | 4 +-- apps/routerconsole/jsp/oldstats.jsp | 4 +-- apps/routerconsole/jsp/peers.jsp | 4 +-- apps/routerconsole/jsp/profiles.jsp | 4 +-- apps/routerconsole/jsp/tunnels.jsp | 4 +-- history.txt | 15 ++++++++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 24 files changed, 122 insertions(+), 107 deletions(-) diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh index 3b80c80e9c..607b4b00a8 100755 --- a/apps/routerconsole/java/bundle-messages.sh +++ b/apps/routerconsole/java/bundle-messages.sh @@ -27,8 +27,8 @@ do # translate calls must be one of the forms: # _("foo") # _x("foo") - # cssHelper._("foo") - # cssHelper.title("foo") + # intl._("foo") + # intl.title("foo") # handler._("foo") # formhandler._("foo") # In a jsp, you must use a helper or handler that has the context set. @@ -36,7 +36,7 @@ do # then ant distclean updater. find src ../jsp/WEB-INF -name *.java > $TMPFILE xgettext -f $TMPFILE -F -L java \ - --keyword=_ --keyword=_x --keyword=cssHelper._ --keyword=cssHelper.title \ + --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ --keyword=handler._ --keyword=formhandler._ \ -o ${i}t if [ $? -ne 0 ] diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index ed48e544bb..c4f72738ee 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -4,7 +4,7 @@ <%@include file="css.jsp" %> -<%=cssHelper.title("config advanced")%> +<%=intl.title("config advanced")%> <%@include file="summary.jsp" %> @@ -12,7 +12,7 @@ " /> -

<%=cssHelper._("I2P Advanced Configuration")%>

+

<%=intl._("I2P Advanced Configuration")%>

<%@include file="confignav.jsp" %> @@ -29,10 +29,10 @@ System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %> " /> -

<%=cssHelper._("Advanced I2P Configuration")%>

+

<%=intl._("Advanced I2P Configuration")%>



- <%=cssHelper._("NOTE")%>: <%=cssHelper._("Some changes may require a restart to take effect.")%> + <%=intl._("NOTE")%>: <%=intl._("Some changes may require a restart to take effect.")%>
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 10f4271d77..8a929782d4 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -4,7 +4,7 @@ <%@include file="css.jsp" %> -<%=cssHelper.title("config clients")%> +<%=intl.title("config clients")%>