guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mjum...@apache.org
Subject [2/4] incubator-guacamole-client git commit: GUACAMOLE-323: Add translation file; hide ticket field header.
Date Fri, 23 Jun 2017 21:38:00 GMT
GUACAMOLE-323: Add translation file; hide ticket field header.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/ab40313c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ab40313c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ab40313c

Branch: refs/heads/staging/0.9.13-incubating
Commit: ab40313ced8fe6f47e41f9fae8494f053c875959
Parents: 5a763d2
Author: Nick Couchman <vnick@apache.org>
Authored: Thu Jun 15 20:58:26 2017 -0400
Committer: Nick Couchman <nick.couchman@yahoo.com>
Committed: Mon Jun 19 14:59:20 2017 -0400

----------------------------------------------------------------------
 .../auth/cas/AuthenticationProviderService.java         |  2 +-
 .../src/main/resources/guac-manifest.json               |  4 ++++
 .../src/main/resources/translations/en.json             | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab40313c/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java
b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java
index edd89dc..044c00f 100644
--- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java
@@ -91,7 +91,7 @@ public class AuthenticationProviderService {
 
         // Request CAS ticket
         throw new GuacamoleInsufficientCredentialsException(
-            "Please wait, redirecting to CAS authentication.",
+            "LOGIN.INFO_CAS_REDIRECT_PENDING",
             new CredentialsInfo(Arrays.asList(new Field[] {
 
                 // CAS-specific ticket (will automatically redirect the user

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab40313c/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
index d0f3353..fd963a2 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@ -9,6 +9,10 @@
         "org.apache.guacamole.auth.cas.CASAuthenticationProvider"
     ],
 
+    "translations" : [
+        "translations/en.json"
+    ],
+
     "js" : [
         "casModule.js",
         "casController.js",

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab40313c/extensions/guacamole-auth-cas/src/main/resources/translations/en.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/en.json b/extensions/guacamole-auth-cas/src/main/resources/translations/en.json
new file mode 100644
index 0000000..dfda606
--- /dev/null
+++ b/extensions/guacamole-auth-cas/src/main/resources/translations/en.json
@@ -0,0 +1,12 @@
+{
+
+    "DATA_SOURCE_CAS" : {
+        "NAME" : "CAS SSO Backend"
+    },
+
+    "LOGIN" : {
+        "FIELD_HEADER_TICKET"        : "",
+        "INFO_CAS_REDIRECT_PENDING"  : "Please wait, redirecting to CAS authentication."
+    }
+
+}


Mime
View raw message