fixups after review

This commit is contained in:
zzz
2017-07-13 15:46:37 +00:00
parent d2da262374
commit 5ddb4edd14
11 changed files with 29 additions and 16 deletions

View File

@ -29,7 +29,8 @@ public class HomeHelper extends HelperBase {
static final String DEFAULT_SERVICES =
_x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S +
_x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "info/bandwidth.png" + S +
_x("Configure UI") + S + _x("Select console theme & language & set optional console password") + S + "/configui" + S + I + "info/ui.png" + S +
// FIXME wasn't escaped
_x("Configure UI") + S + _x("Select console theme & language & set optional console password").replace("&", "&") + S + "/configui" + S + I + "info/ui.png" + S +
_x("Customize Home Page") + S + _x("I2P Home Page Configuration") + S + "/confighome" + S + I + "home_page.png" + S +
_x("Email") + S + _x("Anonymous webmail client") + S + "/susimail/susimail" + S + I + "email.png" + S +
_x("Help") + S + _x("I2P Router Help") + S + "/help" + S + I + "support.png" + S +
@ -229,7 +230,7 @@ public class HomeHelper extends HelperBase {
.append(app.name)
.append("\">")
.append(DataHelper.escapeHTML(app.name))
.append("</td><td align=\"left\"><a href=\"");
.append("</label></td><td align=\"left\"><a href=\"");
String url = DataHelper.escapeHTML(app.url);
buf.append(url)
.append("\">");

View File

@ -88,8 +88,9 @@ public class NewsFeedHelper extends HelperBase {
if (entry.link != null)
buf.append("</a>");
if (entry.authorName != null) {
// FIXME translate
buf.append(" <span class=\"newsAuthor\" title=\"Post author\"><i>")
.append(Messages.getString("{0}", DataHelper.escapeHTML(entry.authorName), ctx))
.append(DataHelper.escapeHTML(entry.authorName))
.append("</i></span>\n");
}
buf.append("</h3>\n<div class=\"newscontent\">\n")

View File

@ -84,7 +84,7 @@ public class PeerHelper extends HelperBase {
UDPTransport ut = (UDPTransport) t;
render(ut, out, urlBase, sortFlags);
} else {
// pluggable (none yet_
// pluggable (none yet)
t.renderStatusHTML(out, urlBase, sortFlags);
}
}
@ -152,7 +152,7 @@ public class PeerHelper extends HelperBase {
return buf.toString();
}
/// begin SSU
/// begin NTCP
/**
* @since 0.9.31 moved from NTCPTransport

View File

@ -175,8 +175,9 @@ class ProfileOrganizerRenderer {
RateAverages ra = RateAverages.getTemp();
Rate failed = prof.getTunnelHistory().getFailedRate().getRate(30*60*1000);
long fails = failed.computeAverages(ra, false).getTotalEventCount();
if (fails == 0) buf.append(_t("OK"));
if (fails > 0) {
if (fails == 0) {
buf.append(_t("OK"));
} else if (fails > 0) {
Rate accepted = prof.getTunnelCreateResponseTime().getRate(30*60*1000);
long total = fails + accepted.computeAverages(ra, false).getTotalEventCount();
if (total / fails <= 10) // hide if < 10%

View File

@ -161,7 +161,7 @@ public class SummaryHelper extends HelperBase {
*
* @since 0.9.31
*/
public class NetworkStateMessage {
public static class NetworkStateMessage {
private NetworkState state;
private String msg;
@ -184,7 +184,7 @@ public class SummaryHelper extends HelperBase {
@Override
public String toString() {
return super.toString() + " (" + state + "; " + msg + ')';
return "(" + state + "; " + msg + ')';
}
}