From 381dbc4b4a41f6be1304f6b8b0022749986c1f27 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 30 Jan 2015 15:55:12 +0000 Subject: [PATCH] Proxy error page tweaks --- .../src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java | 10 ++++++---- installer/resources/proxy/dnf-header.ht | 4 ++-- installer/resources/proxy/dnfh-header.ht | 6 +++--- installer/resources/proxy/dnfp-header.ht | 4 ++-- installer/resources/proxy/enc-header.ht | 4 ++-- installer/resources/proxy/encp-header.ht | 4 ++-- installer/resources/proxy/nols-header.ht | 4 ++-- installer/resources/proxy/nolsp-header.ht | 4 ++-- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java index 858458e3f..8884210f3 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java @@ -706,11 +706,13 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem if (first) { first = false; - out.write("

".getBytes()); - out.write(_("Click a link below to look for an address helper by using a \"jump\" service:").getBytes("UTF-8")); - out.write("
\n".getBytes()); + out.write("

".getBytes()); + out.write(_("Click a link below for an address helper from a jump service").getBytes("UTF-8")); + out.write("

\n".getBytes()); + } else { + out.write("
".getBytes()); } - out.write("
".getBytes()); diff --git a/installer/resources/proxy/dnf-header.ht b/installer/resources/proxy/dnf-header.ht index ffb9426da..c723ed730 100644 --- a/installer/resources/proxy/dnf-header.ht +++ b/installer/resources/proxy/dnf-header.ht @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Warning: Website Unreachable") +_("Website Unreachable") @@ -16,7 +16,7 @@ Proxy-Connection: close _("Configuration") _("Help") _("Addressbook")
-

_("Warning: Website Unreachable")

+

_("Website Unreachable")

_("The website was not reachable.") _("The website is offline, there is network congestion, or your router is not yet well-integrated with peers.") diff --git a/installer/resources/proxy/dnfh-header.ht b/installer/resources/proxy/dnfh-header.ht index fdaa4a2b9..3fbfe070f 100644 --- a/installer/resources/proxy/dnfh-header.ht +++ b/installer/resources/proxy/dnfh-header.ht @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Warning: Website Unknown") +_("Website Unknown") @@ -16,7 +16,7 @@ Proxy-Connection: close _("Configuration") _("Help") _("Addressbook")

-

_("Warning: Website Not Found in Addressbook")

+

_("Website Not Found in Addressbook")

_("The website was not found in your router's addressbook.") _("Check the link or find a Base 32 or Base 64 address.") @@ -24,7 +24,7 @@ _("If you have the Base 64 address, {0}add it to your addressbook{1}.", "

-_("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "", "", "", "") +_("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "", "", "", "")

_("Could not find the following destination:") diff --git a/installer/resources/proxy/dnfp-header.ht b/installer/resources/proxy/dnfp-header.ht index f625775a7..4c80f5879 100644 --- a/installer/resources/proxy/dnfp-header.ht +++ b/installer/resources/proxy/dnfp-header.ht @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Warning: Outproxy Not Found") +_("Outproxy Not Found") @@ -16,7 +16,7 @@ Proxy-Connection: close _("Configuration") _("Help") _("Addressbook")

-

_("Warning: Outproxy Not Found")

+

_("Outproxy Not Found")

_("The HTTP Outproxy was not found.") _("It is offline, there is network congestion, or your router is not yet well-integrated with peers.") diff --git a/installer/resources/proxy/enc-header.ht b/installer/resources/proxy/enc-header.ht index ba77fadf9..117ed6ad1 100644 --- a/installer/resources/proxy/enc-header.ht +++ b/installer/resources/proxy/enc-header.ht @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Warning: Website Unreachable") +_("Website Unreachable") @@ -16,7 +16,7 @@ Proxy-Connection: close _("Configuration") _("Help") _("Addressbook")

-

_("Warning: Website Unreachable")

+

_("Website Unreachable")

_("The website was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")

diff --git a/installer/resources/proxy/encp-header.ht b/installer/resources/proxy/encp-header.ht index 9d53fb707..e32aad38b 100644 --- a/installer/resources/proxy/encp-header.ht +++ b/installer/resources/proxy/encp-header.ht @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Warning: Outproxy Unreachable") +_("Outproxy Unreachable") @@ -16,7 +16,7 @@ Proxy-Connection: close _("Configuration") _("Help") _("Addressbook")
-

_("Warning: Outproxy Unreachable")

+

_("Outproxy Unreachable")

_("The HTTP outproxy was not reachable, because it uses encryption options that are not supported by your I2P or Java version.") _("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "", "", "", "") diff --git a/installer/resources/proxy/nols-header.ht b/installer/resources/proxy/nols-header.ht index 0adf713f3..8c817a3fb 100644 --- a/installer/resources/proxy/nols-header.ht +++ b/installer/resources/proxy/nols-header.ht @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Warning: Website Unreachable") +_("Website Unreachable") @@ -16,7 +16,7 @@ Proxy-Connection: close _("Configuration") _("Help") _("Addressbook")

-

_("Warning: Website Unreachable")

+

_("Website Unreachable")

_("The website was not reachable, because its lease set was not found.") _("The website is probably down, but there could also be network congestion.") diff --git a/installer/resources/proxy/nolsp-header.ht b/installer/resources/proxy/nolsp-header.ht index bed468f44..6d162123f 100644 --- a/installer/resources/proxy/nolsp-header.ht +++ b/installer/resources/proxy/nolsp-header.ht @@ -6,7 +6,7 @@ Proxy-Connection: close -_("Warning: Outproxy Not Found") +_("Outproxy Not Found") @@ -16,7 +16,7 @@ Proxy-Connection: close _("Configuration") _("Help") _("Addressbook")

-

_("Warning: Outproxy Not Found")

+

_("Outproxy Not Found")

_("The HTTP outproxy was not reachable, because its lease set was not found.") _("The outproxy is probably down, but there could also be network congestion.")