echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "Base32" and "Base64" consistently in strings

Browse Source 
Update clearnet user-agent to match TBB
This commit is contained in:
zzz
2019-11-21 13:59:26 +00:00
parent 7b391fa17a
commit 4e81e48d64
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@ -92,7 +92,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"\r\n";
// ESR version of Firefox, same as Tor Browser
private static final String UA_CLEARNET = "User-Agent: " +
"Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0" +
"Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0" +
"\r\n";
// overrides
private static final String PROP_UA_I2P = "httpclient.userAgent.i2p";
@ -1221,7 +1221,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// 8-59 or 61-63 chars, this won't work
String header = getErrorPage("b32", ERR_DESTINATION_UNKNOWN);
try {
writeErrorMessage(header, _t("Corrupt b32 address"), out, targetRequest, false, destination);
writeErrorMessage(header, _t("Corrupt Base32 address"), out, targetRequest, false, destination);
} catch (IOException ioe) {}
return;
}
@ -1271,7 +1271,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// form to supply missing data
writeB32SaveForm(out, destination, code, targetRequest);
return;
}
// fall through to standard destination unreachable error page
}

2
apps/i2ptunnel/jsp/wizard.jsp
View File

@ -285,7 +285,7 @@
<td>
<p>
<%=intl._t("Type in the I2P destination of the service that this client tunnel should connect to.")%>
<%=intl._t("This could be the full base 64 destination key, or an I2P URL from your address book.")%>
<%=intl._t("This could be the full Base64 destination key, or an I2P URL from your address book.")%>
</p>
</td>
</tr>

2
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
View File

@ -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 hostname, destination, or blinded Base32"));
return;
}
// from BlindCache

2
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -37,7 +37,7 @@
<% } %>
</td>
</tr><tr>
<td align="right"><b><%=intl._t("Full destination, name, base 32, or hash")%>:</b></td>
<td align="right"><b><%=intl._t("Full destination, name, Base32, or hash")%>:</b></td>
<td><input type="text" name="peer" size="55"></td>
</tr><tr>
<td align="right"><b><%=intl._t("Type")%>:</b></td>

2
installer/resources/proxy/b32-header.ht
View File

@ -19,7 +19,7 @@ Proxy-Connection: close
<div class="warning" id="warning">
<h3>_("Warning: Invalid Destination")</h3>
<p>
_("The b32 address is invalid.")
_("The Base32 address is invalid.")
<hr>
<p><b>_("Could not find the following destination:")</b>
</p>