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

Console: Consolidate 'selected' strings

Browse Source
This commit is contained in:
zzz
2019-10-23 11:16:02 +00:00
parent 68a03b835a
commit 413eb7d0eb
9 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
View File

@ -120,7 +120,7 @@ public class ConfigUpdateHelper extends HelperBase {
for (int i = 0; i < PERIODS.length; i++) {
buf.append("<option value=\"").append(PERIODS[i]);
if (PERIODS[i] == ms)
buf.append("\" selected=\"selected");
buf.append('"').append(SELECTED);
if (PERIODS[i] == -1)
buf.append("\">").append(_t("Never")).append("</option>\n");
@ -142,14 +142,14 @@ public class ConfigUpdateHelper extends HelperBase {
buf.append("<option value=\"notify\"");
if ("notify".equals(policy) || _dontInstall)
buf.append(" selected=\"selected\"");
buf.append(SELECTED);
buf.append('>').append(_t("Notify only")).append("</option>");
buf.append("<option value=\"download\"");
if (_dontInstall)
buf.append(" disabled=\"disabled\"");
else if ("download".equals(policy))
buf.append(" selected=\"selected\"");
buf.append(SELECTED);
buf.append('>').append(_t("Download and verify only")).append("</option>");
if (_context.hasWrapper()) {
@ -157,7 +157,7 @@ public class ConfigUpdateHelper extends HelperBase {
if (_dontInstall)
buf.append(" disabled=\"disabled\"");
else if ("install".equals(policy))
buf.append(" selected=\"selected\"");
buf.append(SELECTED);
buf.append('>').append(_t("Download, verify, and restart")).append("</option>");
}

1
apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
View File

@ -15,6 +15,7 @@ public abstract class HelperBase {
public static final String PROP_ADVANCED = "routerconsole.advanced";
/** @since public since 0.9.33, was package private */
public static final String CHECKED = " checked=\"checked\" ";
/** @since 0.9.43 */
public static final String SELECTED = " selected=\"selected\" ";
/**

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

@ -82,7 +82,7 @@ public class ConfigLoggingHelper extends HelperBase {
String l = levels[i];
buf.append("<option value=\"").append(l).append('\"');
if (l.equals(cur))
buf.append(" selected=\"selected\"");
buf.append(SELECTED);
buf.append('>').append(_t(l)).append("</option>\n");
}

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

@ -358,7 +358,7 @@ public class ConfigNetHelper extends HelperBase {
}
buf.append("<option style=\"text-align: right;\" value=\"").append(val).append("\" ");
if (pct == val) {
buf.append("selected=\"selected\" ");
buf.append(SELECTED);
found = true;
}
buf.append(">").append(val).append("%</option>\n");

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

@ -226,7 +226,7 @@ public class ConfigTunnelsHelper extends HelperBase {
for (int i = min; i <= max; i++) {
buf.append("<option value=\"").append(i).append("\" ");
if (i == now)
buf.append("selected=\"selected\" ");
buf.append(SELECTED);
buf.append(">").append(ngettext(DUMMY1 + name, DUMMY2 + name + 's', i));
buf.append("</option>\n");
}

5
apps/routerconsole/java/src/net/i2p/router/web/helpers/EventLogHelper.java
View File

@ -14,6 +14,7 @@ import net.i2p.data.DataHelper;
import net.i2p.router.util.EventLog;
import net.i2p.router.web.CSSHelper;
import net.i2p.router.web.FormHandler;
import net.i2p.router.web.HelperBase;
import net.i2p.util.SystemVersion;
/**
@ -128,7 +129,7 @@ public class EventLogHelper extends FormHandler {
_out.write(val);
_out.write("\"");
if (val.equals(_event))
_out.write(" selected=\"selected\"");
_out.write(HelperBase.SELECTED);
_out.write(">");
_out.write(key);
_out.write("</option>\n");
@ -139,7 +140,7 @@ public class EventLogHelper extends FormHandler {
_out.write(Long.toString(age));
_out.write("\"");
if (age == _age)
_out.write(" selected=\"selected\"");
_out.write(HelperBase.SELECTED);
_out.write(">");
if (age == 0)
_out.write(_t("All events"));

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

@ -398,7 +398,7 @@ public class GraphHelper extends FormHandler {
_out.write(Integer.toString(times[i]));
_out.write('"');
if (times[i] == _refreshDelaySeconds)
_out.write(" selected=\"selected\"");
_out.write(HelperBase.SELECTED);
_out.write('>');
if (times[i] > 0)
_out.write(DataHelper.formatDuration2(times[i] * 1000));

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

@ -78,7 +78,7 @@ public class SearchHelper extends HelperBase {
for (String name : _engines.keySet()) {
buf.append("<option value=\"").append(name).append('\"');
if (name.equals(dflt))
buf.append(" selected=\"selected\"");
buf.append(SELECTED);
buf.append('>').append(name).append("</option>\n");
}
buf.append("</select>\n");

6
apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java
View File

@ -260,7 +260,7 @@ public class SybilRenderer {
for (Long date : dates) {
buf.append("<option value=\"").append(date).append('\"');
if (first) {
buf.append(" selected=\"selected\"");
buf.append(HelperBase.SELECTED);
first = false;
}
buf.append('>').append(DataHelper.formatTime(date.longValue())).append("</option>\n");
@ -309,7 +309,7 @@ public class SybilRenderer {
buf.append('"');
long time = HOURS[i] * 60*60*1000L;
if (time == freq)
buf.append(" selected=\"selected\"");
buf.append(HelperBase.SELECTED);
buf.append('>');
if (HOURS[i] > 0)
buf.append(DataHelper.formatDuration2(time));
@ -340,7 +340,7 @@ public class SybilRenderer {
buf.append('"');
long time = DAYS[i] * 24*60*60*1000L;
if (time == age)
buf.append(" selected=\"selected\"");
buf.append(HelperBase.SELECTED);
buf.append('>');
if (DAYS[i] > 0)
buf.append(DataHelper.formatDuration2(time));