From ee4f8cf7968036ea02144a22da9be3e64165c1e9 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 11 Feb 2017 16:45:10 -0800 Subject: [PATCH] GUACAMOLE-208: Define UPSTREAM_UNAVAILABLE and UPSTREAM_NOT_FOUND strings for tunnel errors. --- .../src/main/webapp/app/client/controllers/clientController.js | 2 ++ guacamole/src/main/webapp/translations/en.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js index 908d1ff50..d4264576b 100644 --- a/guacamole/src/main/webapp/app/client/controllers/clientController.js +++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js @@ -117,6 +117,8 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams 0x0203: true, 0x0204: true, 0x0205: true, + 0x0207: true, + 0x0208: true, 0x0301: true, 0x0303: true, 0x0308: true, diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 3dba567d9..d92c3e237 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -83,6 +83,8 @@ "ERROR_TUNNEL_203" : "The server encountered an error and has closed the connection. Please try again or contact your system administrator.", "ERROR_TUNNEL_204" : "The requested connection does not exist. Please check the connection name and try again.", "ERROR_TUNNEL_205" : "This connection is currently in use, and concurrent access to this connection is not allowed. Please try again later.", + "ERROR_TUNNEL_207" : "The Guacamole server is not currently reachable. Please check your network and try again.", + "ERROR_TUNNEL_208" : "The Guacamole server is not accepting connections. Please check your network and try again.", "ERROR_TUNNEL_301" : "You do not have permission to access this connection because you are not logged in. Please log in and try again.", "ERROR_TUNNEL_303" : "You do not have permission to access this connection. If you require access, please ask your system administrator to add you the list of allowed users, or check your system settings.", "ERROR_TUNNEL_308" : "The Guacamole server has closed the connection because there has been no response from your browser for long enough that it appeared to be disconnected. This is commonly caused by network problems, such as spotty wireless signal, or simply very slow network speeds. Please check your network and try again.",