diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index 53ed82749..6951286dc 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java @@ -359,7 +359,7 @@ public class IndexBean { if (tun != null && tun.getName() != null) return tun.getName(); else - return "New Tunnel"; + return _("New Tunnel"); } public String getClientPort(int tunnel) { @@ -379,16 +379,16 @@ public class IndexBean { } public String getTypeName(String internalType) { - if ("client".equals(internalType)) return "Standard client"; - else if ("httpclient".equals(internalType)) return "HTTP client"; - else if ("ircclient".equals(internalType)) return "IRC client"; - else if ("server".equals(internalType)) return "Standard server"; - else if ("httpserver".equals(internalType)) return "HTTP server"; - else if ("sockstunnel".equals(internalType)) return "SOCKS 4/4a/5 proxy"; - else if ("connectclient".equals(internalType)) return "CONNECT/SSL/HTTPS proxy"; - else if ("ircserver".equals(internalType)) return "IRC server"; - else if ("streamrclient".equals(internalType)) return "Streamr client"; - else if ("streamrserver".equals(internalType)) return "Streamr server"; + if ("client".equals(internalType)) return _("Standard client"); + else if ("httpclient".equals(internalType)) return _("HTTP client"); + else if ("ircclient".equals(internalType)) return _("IRC client"); + else if ("server".equals(internalType)) return _("Standard server"); + else if ("httpserver".equals(internalType)) return _("HTTP server"); + else if ("sockstunnel".equals(internalType)) return _("SOCKS 4/4a/5 proxy"); + else if ("connectclient".equals(internalType)) return _("CONNECT/SSL/HTTPS proxy"); + else if ("ircserver".equals(internalType)) return _("IRC server"); + else if ("streamrclient".equals(internalType)) return _("Streamr client"); + else if ("streamrserver".equals(internalType)) return _("Streamr server"); else return internalType; } @@ -935,4 +935,8 @@ public class IndexBean { buf.append((String)msgs.get(i)).append("\n"); } } + + private String _(String key) { + return Messages._(key, _context); + } } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java index 591d6a98c..78f9a4d30 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java @@ -19,6 +19,10 @@ public class Messages { return Translate.getString(key, _context, BUNDLE_NAME); } + public static String _(String key, I2PAppContext ctx) { + return Translate.getString(key, ctx, BUNDLE_NAME); + } + /** * translate a string with a parameter * This is a lot more expensive than getString(s, ctx), so use sparingly. diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index ce4cfacae..81602a607 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -140,7 +140,7 @@ <% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType)) { %>
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index b5520c6df..6dcad017b 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -167,7 +167,7 @@ - + " />