From 355ca7b2f7c61da553dec075d4e7876307e7ecaa Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 14 Nov 2010 23:58:13 +0000
Subject: [PATCH] tweaks after review
---
.../java/src/org/klomp/snark/web/I2PSnarkServlet.java | 2 +-
.../java/src/net/i2p/router/web/ConfigUIHelper.java | 6 +++---
apps/routerconsole/jsp/help.jsp | 4 ++--
apps/routerconsole/jsp/help_nl.jsp | 4 ++--
apps/routerconsole/jsp/help_ru.jsp | 4 ++--
build.xml | 3 +++
core/java/src/net/i2p/util/SecureFileOutputStream.java | 3 +--
7 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 77d739ade8..8508fd99c5 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -274,7 +274,7 @@ public class I2PSnarkServlet extends Default {
out.write("</th>\n<th align=\"center\">");
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/eta.png\" title=\"");
out.write(_("Estimated Download Time"));
- out.write("\">");
+ out.write("\"> ");
out.write(_("ETA"));
out.write("</th>\n<th align=\"center\">");
out.write("<img border=\"0\" src=\"/themes/console/images/inbound.png\" title=\"");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 97f1a5254c..fbb9bad4ff 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -46,9 +46,9 @@ public class ConfigUIHelper extends HelperBase {
return rv;
}
- private static final String langs[] = {"de", "en", "fr", "nl", "ru", "sv", "zh"};
- private static final String flags[] = {"de", "us", "fr", "nl", "ru", "se", "cn"};
- private static final String xlangs[] = {_x("German"), _x("English"), _x("French"),
+ private static final String langs[] = {"de", "en", "es", "fr", "nl", "ru", "sv", "zh"};
+ private static final String flags[] = {"de", "us", "es", "fr", "nl", "ru", "se", "cn"};
+ private static final String xlangs[] = {_x("German"), _x("English"), _x("Spanish"),_x("French"),
_x("Dutch"), _x("Russian"), _x("Swedish"), _x("Chinese")};
/** todo sort by translated string */
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 86acd6dace..6a23198dba 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -50,11 +50,11 @@ Do not be concerned if these numbers vary widely.
<a href="configstats.jsp#router.activePeers">[Enable graphing]</a>.
<li class="tidylist"><b>Fast:</b>
This is the number of peers you use for building client tunnels. It is generally in the
-range 8-15. Your fast peers are shown on the <a href="profiles.jsp">profiles page</a>.
+range 8-30. Your fast peers are shown on the <a href="profiles.jsp">profiles page</a>.
<a href="configstats.jsp#router.fastPeers">[Enable graphing]</a>.
<li class="tidylist"><b>High Capacity:</b>
This is the number of peers you use for building some of your exploratory tunnels. It is generally in the
-range 8-25. The fast peers are included in the high capacity tier.
+range 8-75. The fast peers are included in the high capacity tier.
Your high capacity peers are shown on the <a href="profiles.jsp">profiles page</a>.
<a href="configstats.jsp#router.highCapacityPeers">[Enable graphing]</a>.
<li class="tidylist"><b>Well Integrated:</b>
diff --git a/apps/routerconsole/jsp/help_nl.jsp b/apps/routerconsole/jsp/help_nl.jsp
index b486a4c662..5fbf54dca0 100644
--- a/apps/routerconsole/jsp/help_nl.jsp
+++ b/apps/routerconsole/jsp/help_nl.jsp
@@ -54,12 +54,12 @@ variëren.
<a href="configstats.jsp#router.activePeers">[Grafieken inschakelen]</a>.
<li class="tidylist"><b>Snel:</b>
Dit is het aantal peers dat je gebruikt om client tunnels mee te bouwen. Het ligt over
-het algemeen tussen 8 en 15.
+het algemeen tussen 8 en 30.
Je snelle peers worden getoond op de <a href="profiles.jsp">profielen pagina</a>.
<a href="configstats.jsp#router.fastPeers">[Grafieken inschakelen]</a>.
<li class="tidylist"><b>Grote capaciteit:</b>
Dit is het aantal peers dat je gebruikt om sommige van de onderzoekende tunnels mee te maken.
-Het ligt over het algemeen tussen de 8 en 25. De snelle peers zijn inbegrepen in de categorie grote capaciteit.
+Het ligt over het algemeen tussen de 8 en 75. De snelle peers zijn inbegrepen in de categorie grote capaciteit.
De grote capaciteits peers worden getoond op de <a href="profiles.jsp">profielen pagina</a>.
<a href="configstats.jsp#router.highCapacityPeers">[Grafieken inschakelen]</a>.
<li class="tidylist"><b>Geïntegreerd:</b>
diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp
index 560759236c..03b1fdde83 100644
--- a/apps/routerconsole/jsp/help_ru.jsp
+++ b/apps/routerconsole/jsp/help_ru.jsp
@@ -57,11 +57,11 @@
<li class="tidylist"><b>БыÑтрые:</b>
-КоличеÑтво пиров, которые иÑпользуютÑÑ Ð’Ð°ÑˆÐ¸Ð¼ маршрутизатором Ð´Ð»Ñ Ð¿Ð¾ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ñких туннелей. Ð’ общем Ñлучае Ñто значение будет в диапазоне 8-15. СпиÑок быÑтрых пиров можно поÑмотреть на Ñтранице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.fastPeers">[Включить поÑтроение графика]</a>.
+КоличеÑтво пиров, которые иÑпользуютÑÑ Ð’Ð°ÑˆÐ¸Ð¼ маршрутизатором Ð´Ð»Ñ Ð¿Ð¾ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ñких туннелей. Ð’ общем Ñлучае Ñто значение будет в диапазоне 8-30. СпиÑок быÑтрых пиров можно поÑмотреть на Ñтранице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.fastPeers">[Включить поÑтроение графика]</a>.
<li class="tidylist"><b>Ð’Ñ‹Ñокоёмкие:</b>
-КоличеÑтво пиров, которые иÑпользуютÑÑ Ð’Ð°ÑˆÐ¸Ð¼ маршрутизатором Ð´Ð»Ñ Ð¿Ð¾ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ Ñ‡Ð°Ñти зондирующих туннелей. Ð’ общем Ñлучае Ñто значение будет в диапазоне 8-25. БыÑтрые пиры входÑÑ‚ в группу выÑокоёмких. СпиÑок выÑокоёмких пиров можно поÑмотреть на Ñтранице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.highCapacityPeers">[Включить поÑтроение графика]</a>.
+КоличеÑтво пиров, которые иÑпользуютÑÑ Ð’Ð°ÑˆÐ¸Ð¼ маршрутизатором Ð´Ð»Ñ Ð¿Ð¾ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ Ñ‡Ð°Ñти зондирующих туннелей. Ð’ общем Ñлучае Ñто значение будет в диапазоне 8-75. БыÑтрые пиры входÑÑ‚ в группу выÑокоёмких. СпиÑок выÑокоёмких пиров можно поÑмотреть на Ñтранице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.highCapacityPeers">[Включить поÑтроение графика]</a>.
<li class="tidylist"><b>Хорошо интегрированные:</b>
diff --git a/build.xml b/build.xml
index 73e0dd64e8..35fd093ebe 100644
--- a/build.xml
+++ b/build.xml
@@ -243,9 +243,12 @@
<delete dir="debian/db" />
<delete file="debian/files" />
<delete file="debian/build" />
+ <!-- HH to rework
+ Don't think we should be deleting stuff in .., esp. with wildcards
<delete>
<fileset dir=".." includes="i2p_*.tar.gz,i2p_*.deb,i2p_*.dsc,i2p_*.changes" />
</delete>
+ -->
<ant dir="core/java/" target="distclean" />
<ant dir="router/java/" target="distclean" />
<ant dir="apps/ministreaming/java/" target="distclean" />
diff --git a/core/java/src/net/i2p/util/SecureFileOutputStream.java b/core/java/src/net/i2p/util/SecureFileOutputStream.java
index 3df1f14a58..01c6eba718 100644
--- a/core/java/src/net/i2p/util/SecureFileOutputStream.java
+++ b/core/java/src/net/i2p/util/SecureFileOutputStream.java
@@ -25,8 +25,7 @@ public class SecureFileOutputStream extends FileOutputStream {
}
/**
- * Sets output file to mode 600 only if append = false
- * (otherwise it is presumed to be 600 already)
+ * Sets output file to mode 600 whether append = true or false
*/
public SecureFileOutputStream(String file, boolean append) throws FileNotFoundException {
super(file, append);
--
GitLab