format refresh time

apps/routerconsole/jsp/summaryframe.jsp

@@ -64,7 +64,12 @@
             // this will load in the iframe but subsequent pages will not have the iframe
             out.print("<input type=\"hidden\" name=\"refresh\" value=\"0\" >\n");
             out.print("<button type=\"submit\" value=\"Disable\" >");
-            out.print(intl._("Disable {0}s Refresh", d));
+            long refreshMS = 60*1000;
+            try {
+                refreshMS = 1000 * Long.parseLong(d);
+            } catch (NumberFormatException nfe) {}
+            String refreshTime = net.i2p.data.DataHelper.formatDuration2(refreshMS);
+            out.print(intl._("Disable {0} Refresh", refreshTime));
             out.print("</button></div>\n");
         }
         out.print("</form>\n");

apps/routerconsole/locale/messages_de.po

@@ -5212,8 +5212,8 @@ msgstr "I2P-Router-Statistiken"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:244
 #, java-format
-msgid "Disable {0}s Refresh"
+msgid "Disable {0} Refresh"
-msgstr "alle {0}s Auffrischen ausschalten"
+msgstr "alle {0} Auffrischen ausschalten"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
 msgid "tunnel summary"

apps/routerconsole/locale/messages_fr.po

@@ -5237,8 +5237,8 @@ msgstr "Statistiques du routeur I2P"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:244
 #, java-format
-msgid "Disable {0}s Refresh"
+msgid "Disable {0} Refresh"
-msgstr "Désactiver {0}s actualisation"
+msgstr "Désactiver {0} actualisation"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
 msgid "tunnel summary"

apps/routerconsole/locale/messages_nl.po

@@ -5408,8 +5408,8 @@ msgstr "I2P Router Statistieken"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:244
 #, java-format
-msgid "Disable {0}s Refresh"
+msgid "Disable {0} Refresh"
-msgstr "{0}s Verversing Uitschakelen"
+msgstr "{0} Verversing Uitschakelen"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
 msgid "tunnel summary"

apps/routerconsole/locale/messages_ru.po

@@ -5102,8 +5102,8 @@ msgstr "Статистика маршрутизатора I2P"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:244
 #, java-format
-msgid "Disable {0}s Refresh"
+msgid "Disable {0} Refresh"
-msgstr "Отключить автообновление<br> панели ({0} сек.)"
+msgstr "Отключить автообновление<br> панели ({0})"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
 msgid "tunnel summary"

apps/routerconsole/locale/messages_zh.po

@@ -5035,8 +5035,8 @@ msgstr "I2P 路由器统计数据"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:244
 #, java-format
-msgid "Disable {0}s Refresh"
+msgid "Disable {0} Refresh"
-msgstr "停止 {0}秒 刷新"
+msgstr "停止 {0} 刷新"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
 msgid "tunnel summary"

history.txt

@@ -1,4 +1,6 @@
 2010-12-02 zzz
+    * Console: Format console refresh time
+    * i2psnark: Fix extension messages
     * Streaming: Restore I2PSocketManagerFull as public
                  (broke jwebcahe ticket #345)
     * Transport: Hamachi address block 5/8 assigned by IANA

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 20;
+    public final static long BUILD = 21;
 
     /** for example "-test" */
     public final static String EXTRA = "";