I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* configclients.jsp: Fix add-new-client feature

Browse Source 
* Translate: Catch empty string
This commit is contained in:
zzz
2010-01-18 14:51:39 +00:00
parent b1151f82b5
commit 27a5793fd0
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
View File

@ -108,7 +108,7 @@ public class ConfigClientsHandler extends FormHandler {
int newClient = clients.size(); int newClient = clients.size();
String newDesc = getString("desc" + newClient); String newDesc = getString("desc" + newClient);
if (newDesc != null) { if (newDesc != null && newDesc.trim().length() > 0) {
// new entry // new entry
int spc = newDesc.indexOf(" "); int spc = newDesc.indexOf(" ");
String clss = newDesc; String clss = newDesc;
@ -118,7 +118,7 @@ public class ConfigClientsHandler extends FormHandler {
args = newDesc.substring(spc + 1); args = newDesc.substring(spc + 1);
} }
String name = getString("name" + newClient); String name = getString("name" + newClient);
if (name == null) name = "new client"; if (name == null || name.trim().length() <= 0) name = "new client";
ClientAppConfig ca = new ClientAppConfig(clss, name, args, 2*60*1000, ClientAppConfig ca = new ClientAppConfig(clss, name, args, 2*60*1000,
_settings.get(newClient + ".enabled") != null); _settings.get(newClient + ".enabled") != null);
clients.add(ca); clients.add(ca);

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

@ -79,10 +79,12 @@ public class ConfigClientsHelper extends HelperBase {
buf.append("<a href=\"").append(link).append("\">").append(_(name)).append("</a>"); buf.append("<a href=\"").append(link).append("\">").append(_(name)).append("</a>");
} else if (edit && !ro) { } else if (edit && !ro) {
buf.append("<input type=\"text\" name=\"name").append(index).append("\" value=\""); buf.append("<input type=\"text\" name=\"name").append(index).append("\" value=\"");
buf.append(_(name)); if (name.length() > 0)
buf.append(_(name));
buf.append("\" >"); buf.append("\" >");
} else { } else {
buf.append(_(name)); if (name.length() > 0)
buf.append(_(name));
} }
buf.append("</td><td align=\"center\" width=\"10%\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\" value=\"true\" "); buf.append("</td><td align=\"center\" width=\"10%\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\" value=\"true\" ");
if (enabled) { if (enabled) {

3
core/java/src/net/i2p/util/Translate.java
View File

@ -36,6 +36,9 @@ public abstract class Translate {
return key; return key;
else if (lang.equals(TEST_LANG)) else if (lang.equals(TEST_LANG))
return TEST_STRING; return TEST_STRING;
// shouldnt happen but dont dump the po headers if it does
if (key.equals(""))
return key;
ResourceBundle bundle = findBundle(bun, lang); ResourceBundle bundle = findBundle(bun, lang);
if (bundle == null) if (bundle == null)
return key; return key;