diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java index 87df96a5b..ae9df7209 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java @@ -246,7 +246,7 @@ public class PluginStarter implements Runnable { updated++; } if (updated > 0) - mgr.notifyComplete(null, ngettext("1 plugin updated", "{0} plugins updated", updated, ctx)); + mgr.notifyComplete(null, ngettext("{0} plugin updated", "{0} plugins updated", updated, ctx)); else mgr.notifyComplete(null, Messages.getString("Plugin update check complete", ctx)); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java index b7670bbc5..de02d6f46 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java @@ -13,8 +13,8 @@ public class ConfigTunnelsHelper extends HelperBase { private static final String HOP = "hop"; private static final String TUNNEL = "tunnel"; /** dummies for translation */ - private static final String HOPS = ngettext("1 hop", "{0} hops"); - private static final String TUNNELS = ngettext("1 tunnel", "{0} tunnels"); + private static final String HOPS = ngettext("{0} hop", "{0} hops"); + private static final String TUNNELS = ngettext("{0} tunnel", "{0} tunnels"); public String getForm() { StringBuilder buf = new StringBuilder(1024); @@ -219,7 +219,6 @@ public class ConfigTunnelsHelper extends HelperBase { } /** to fool xgettext so the following isn't tagged */ - private static final String DUMMY1 = "1 "; private static final String DUMMY2 = "{0} "; private void renderOptions(StringBuilder buf, int min, int max, int now, String prefix, String name) { @@ -227,7 +226,7 @@ public class ConfigTunnelsHelper extends HelperBase { buf.append("\n"); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java index 0c9ac4a10..2cd8dd6c7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java @@ -83,11 +83,11 @@ class ProfileOrganizerRenderer { //buf.append("

").append(_t("Peer Profiles")).append("

\n

"); buf.append("

"); - buf.append(ngettext("Showing 1 recent profile.", "Showing {0} recent profiles.", order.size())).append('\n'); + buf.append(ngettext("Showing {0} recent profile.", "Showing {0} recent profiles.", order.size())).append('\n'); if (older > 0) - buf.append(ngettext("Hiding 1 older profile.", "Hiding {0} older profiles.", older)).append('\n'); + buf.append(ngettext("Hiding {0} older profile.", "Hiding {0} older profiles.", older)).append('\n'); if (standard > 0) - buf.append("").append(ngettext("Hiding 1 standard profile.", "Hiding {0} standard profiles.", standard)).append("\n"); + buf.append("").append(ngettext("Hiding {0} standard profile.", "Hiding {0} standard profiles.", standard)).append("\n"); buf.append("

"); buf.append("
"); buf.append(""); @@ -288,11 +288,11 @@ class ProfileOrganizerRenderer { .append("
") .append(_t("Integration")).append(": ").append(num(_organizer.getIntegrationThreshold())) .append("
") - .append(fast).append(' ').append(_t("fast peers")) + .append(ngettext("{0} fast peer", "{0} fast peers", fast)) .append("") - .append(reliable).append(' ').append(_t("high capacity peers")) + .append(ngettext("{0} high capacity peer", "{0} high capacity peers", reliable)) .append("") - .append(integrated).append(' ').append(_t(" well integrated peers")) + .append(ngettext("{0} integrated peer", "{0} integrated peers", integrated)) .append("
\n"); buf.append("

").append(_t("Definitions")).append("

\n") .append(""); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/StatsGenerator.java index a34d1661d..eceb40992 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/StatsGenerator.java @@ -173,7 +173,7 @@ public class StatsGenerator { buf.append("
  • ").append(_t("Lifetime average frequency")).append(": "); buf.append(DataHelper.formatDuration2(freq.getFrequency())); buf.append(" ("); - buf.append(ngettext("1 event", "{0} events", (int) freq.getEventCount())); + buf.append(ngettext("{0} event", "{0} events", (int) freq.getEventCount())); buf.append(")

  • \n"); } @@ -231,7 +231,7 @@ public class StatsGenerator { } buf.append(""); - buf.append(ngettext("There was 1 event in this period.", "There were {0} events in this period.", (int)curRate.getLastEventCount())); + buf.append(ngettext("There was {0} event in this period.", "There were {0} events in this period.", (int)curRate.getLastEventCount())); buf.append(""); buf.append(_t("The period ended {0} ago.", DataHelper.formatDuration2(now - curRate.getLastCoalesceDate()))); buf.append(""); @@ -266,7 +266,7 @@ public class StatsGenerator { buf.append("
  • ").append(_t("Lifetime average value")).append(": "); buf.append(num(rate.getLifetimeAverageValue())); buf.append(" ("); - buf.append(ngettext("1 event", "{0} events", (int) rate.getLifetimeEventCount())); + buf.append(ngettext("{0} event", "{0} events", (int) rate.getLifetimeEventCount())); buf.append(")
  • " + "" + "
    \n");