From a4777f3e5df72153e07d3d4fd8d19650a32f26e5 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 1 Feb 2021 15:48:16 -0500 Subject: [PATCH] Console: Indent address options on /confignet hostname -> host name or other rewording --- .../i2p/router/web/helpers/ConfigKeyringHandler.java | 2 +- .../net/i2p/router/web/helpers/ConfigNetHandler.java | 2 +- .../net/i2p/router/web/helpers/ConfigNetHelper.java | 5 +++-- apps/routerconsole/jsp/confignet.jsp | 10 +++++----- apps/routerconsole/jsp/configreseed.jsp | 2 +- apps/routerconsole/jsp/help-reachability.jsi | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java index 5348bab11..f20524008 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java @@ -84,7 +84,7 @@ public class ConfigKeyringHandler extends FormHandler { spk = bdin.getUnblindedPubKey(); } if (spk == null) { - addFormError(_t("Requires hostname, destination, or blinded Base32")); + addFormError(_t("Requires host name, destination, or blinded Base32")); return; } // from BlindCache diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java index acd2c23b8..bb40ab5ba 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java @@ -466,7 +466,7 @@ public class ConfigNetHandler extends FormHandler { // TODO set IPv6 arg based on configuration? boolean rv = TransportUtil.isPubliclyRoutable(iab, true); if (!rv) - addFormError(_t("The hostname or IP {0} is not publicly routable", addr)); + addFormError(_t("The address {0} is not publicly routable", addr)); return rv; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java index 30fbc1f87..9e98303e1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java @@ -236,6 +236,7 @@ public class ConfigNetHelper extends HelperBase { } StringBuilder buf = new StringBuilder(128); for (String addr : addrs) { + buf.append("\n
         "); buf.append(" "); buf.append(addr); - buf.append("
\n"); } if (!addrs.isEmpty()) { - buf.append(_t("Add host name or IP")) + buf.append("\n
           ") + .append(_t("Add host name or IP")) .append(": "); } buf.append(""); diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp index bf81f90dc..3b7148858 100644 --- a/apps/routerconsole/jsp/confignet.jsp +++ b/apps/routerconsole/jsp/confignet.jsp @@ -40,7 +40,7 @@

<%=intl._t("Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1.")%>  - <%=intl._t("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>  + <%=intl._t("If you specify the wrong IP address, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>  <%=intl._t("When in doubt, leave the settings at the defaults.")%> 

@@ -59,7 +59,7 @@ - <%=intl._t("Externally reachable hostname or IP address")%>:
+ <%=intl._t("Externally reachable IP address")%>:

<%=nethelper.getAddressSelector() %> @@ -137,7 +137,7 @@ - <%=intl._t("Externally reachable hostname or IP address")%>:
+ <%=intl._t("Externally reachable IP address")%>:
" > diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp index 44672c023..8823f53b6 100644 --- a/apps/routerconsole/jsp/configreseed.jsp +++ b/apps/routerconsole/jsp/configreseed.jsp @@ -26,7 +26,7 @@