* I2PTunnel: Improve messages when starting and stopping tunnels, add some tags

This commit is contained in:
zzz
2010-11-17 14:27:32 +00:00
parent e68a3fb856
commit bf0275ddcb

View File

@@ -167,7 +167,7 @@ public class IndexBean {
if ( (_action == null) || (_action.trim().length() <= 0) || ("Cancel".equals(_action))) if ( (_action == null) || (_action.trim().length() <= 0) || ("Cancel".equals(_action)))
return ""; return "";
if ( (!haveNonce(_curNonce)) && (!validPassphrase()) ) if ( (!haveNonce(_curNonce)) && (!validPassphrase()) )
return "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."; return _("Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.");
if ("Stop all".equals(_action)) if ("Stop all".equals(_action))
return stopAll(); return stopAll();
else if ("Start all".equals(_action)) else if ("Start all".equals(_action))
@@ -214,7 +214,7 @@ public class IndexBean {
if (_group == null) return ""; if (_group == null) return "";
_group.reloadControllers(); _group.reloadControllers();
return "Config reloaded"; return _("Configuration reloaded for all tunnels");
} }
private String start() { private String start() {
if (_tunnel < 0) return "Invalid tunnel"; if (_tunnel < 0) return "Invalid tunnel";
@@ -223,7 +223,10 @@ public class IndexBean {
if (_tunnel >= controllers.size()) return "Invalid tunnel"; if (_tunnel >= controllers.size()) return "Invalid tunnel";
TunnelController controller = (TunnelController)controllers.get(_tunnel); TunnelController controller = (TunnelController)controllers.get(_tunnel);
controller.startTunnelBackground(); controller.startTunnelBackground();
return ""; // give the messages a chance to make it to the window
try { Thread.sleep(1000); } catch (InterruptedException ie) {}
// and give them something to look at in any case
return _("Starting tunnel...");
} }
private String stop() { private String stop() {
@@ -233,7 +236,10 @@ public class IndexBean {
if (_tunnel >= controllers.size()) return "Invalid tunnel"; if (_tunnel >= controllers.size()) return "Invalid tunnel";
TunnelController controller = (TunnelController)controllers.get(_tunnel); TunnelController controller = (TunnelController)controllers.get(_tunnel);
controller.stopTunnel(); controller.stopTunnel();
return ""; // give the messages a chance to make it to the window
try { Thread.sleep(1000); } catch (InterruptedException ie) {}
// and give them something to look at in any case
return _("Stopping tunnel...");
} }
private String saveChanges() { private String saveChanges() {