From 817f19290df87fdf818b2b5804f350959fa6b12c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 25 Nov 2021 18:21:17 -0800 Subject: [PATCH] GUACAMOLE-1364: Unify translations of SSO extensions. --- .../src/main/resources/translations/ca.json | 15 +++++++++++++ .../src/main/resources/translations/de.json | 2 +- .../src/main/resources/translations/en.json | 22 +++++++++++++++++++ .../src/main/resources/translations/fr.json | 7 ++++++ .../src/main/resources/translations/ja.json | 7 ++++++ .../src/main/resources/translations/ko.json | 2 +- .../src/main/resources/translations/pt.json | 7 ++++++ .../src/main/resources/translations/ru.json | 15 +++++++++++++ .../src/main/resources/translations/zh.json | 15 +++++++++++++ .../cas/AuthenticationProviderService.java | 2 +- .../src/main/resources/translations/ca.json | 11 ---------- .../src/main/resources/translations/de.json | 12 ---------- .../src/main/resources/translations/en.json | 12 ---------- .../src/main/resources/translations/fr.json | 12 ---------- .../src/main/resources/translations/ja.json | 7 ------ .../src/main/resources/translations/ko.json | 7 ------ .../src/main/resources/translations/pt.json | 12 ---------- .../src/main/resources/translations/ru.json | 11 ---------- .../src/main/resources/translations/zh.json | 12 ---------- .../openid/AuthenticationProviderService.java | 2 +- .../src/main/resources/translations/ca.json | 12 ---------- .../src/main/resources/translations/en.json | 12 ---------- .../src/main/resources/translations/fr.json | 12 ---------- .../src/main/resources/translations/ja.json | 7 ------ .../src/main/resources/translations/ko.json | 7 ------ .../src/main/resources/translations/pt.json | 12 ---------- .../src/main/resources/translations/ru.json | 11 ---------- .../src/main/resources/translations/zh.json | 12 ---------- .../saml/AuthenticationProviderService.java | 2 +- .../src/main/resources/guac-manifest.json | 8 +++++-- .../src/main/resources/translations/ca.json | 12 ---------- .../src/main/resources/translations/en.json | 12 ---------- .../src/main/resources/translations/fr.json | 12 ---------- .../src/main/resources/translations/pt.json | 12 ---------- 34 files changed, 99 insertions(+), 236 deletions(-) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ca.json rename extensions/guacamole-auth-sso/modules/{guacamole-auth-sso-openid => guacamole-auth-sso-base}/src/main/resources/translations/de.json (52%) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/fr.json create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ja.json rename extensions/guacamole-auth-sso/modules/{guacamole-auth-sso-saml => guacamole-auth-sso-base}/src/main/resources/translations/ko.json (71%) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/pt.json create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ru.json create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/zh.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ca.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/de.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/en.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/fr.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ja.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ko.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/pt.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ru.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/zh.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ca.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/en.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/fr.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ja.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ko.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/pt.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ru.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/zh.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ca.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/en.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/fr.json delete mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/pt.json diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ca.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ca.json new file mode 100644 index 000000000..b2d3c38ff --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ca.json @@ -0,0 +1,15 @@ +{ + + "DATA_SOURCE_CAS" : { + "NAME" : "Backend d'inici de sessió unificat (SSO) CAS" + }, + + "DATA_SOURCE_SAML" : { + "NAME" : "Extensión de autenticación SAML" + }, + + "LOGIN" : { + "INFO_IDP_REDIRECT_PENDING" : "Espereu, redirigint al proveïdor d'identitat ..." + } + +} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/de.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/de.json similarity index 52% rename from extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/de.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/de.json index cad78677f..cc391fca2 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/de.json +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/de.json @@ -1,7 +1,7 @@ { "LOGIN" : { - "INFO_OID_REDIRECT_PENDING" : "Bitte warten, Sie werden zum Identitätsprovider weitergeleitet..." + "INFO_IDP_REDIRECT_PENDING" : "Bitte warten, Sie werden zum Identitätsprovider weitergeleitet..." } } diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json new file mode 100644 index 000000000..2d212e423 --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json @@ -0,0 +1,22 @@ +{ + + "DATA_SOURCE_CAS" : { + "NAME" : "CAS SSO Backend" + }, + + "DATA_SOURCE_OPENID" : { + "NAME" : "OpenID SSO Backend" + }, + + "DATA_SOURCE_SAML" : { + "NAME" : "SAML SSO Backend" + }, + + "LOGIN" : { + "FIELD_HEADER_ID_TOKEN" : "", + "FIELD_HEADER_SAML" : "", + "FIELD_HEADER_TICKET" : "", + "INFO_IDP_REDIRECT_PENDING" : "Please wait, redirecting to identity provider..." + } + +} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/fr.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/fr.json new file mode 100644 index 000000000..bb25a90a9 --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/fr.json @@ -0,0 +1,7 @@ +{ + + "LOGIN" : { + "INFO_IDP_REDIRECT_PENDING" : "Veuillez patienter, redirection vers le fournisseur d'identité..." + } + +} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ja.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ja.json new file mode 100644 index 000000000..fde74e55c --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ja.json @@ -0,0 +1,7 @@ +{ + + "LOGIN" : { + "INFO_IDP_REDIRECT_PENDING" : "IDプロバイダへリダイレクトしています。" + } + +} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ko.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ko.json similarity index 71% rename from extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ko.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ko.json index c0c520efb..a0a3eb979 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ko.json +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ko.json @@ -5,7 +5,7 @@ }, "LOGIN" : { - "INFO_SAML_REDIRECT_PENDING": "잠시만 기다려주십시오. ID 제공자로 리디렉션 중..." + "INFO_IDP_REDIRECT_PENDING" : "잠시만 기다려주십시오. ID 제공자로 리디렉션 중..." } } diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/pt.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/pt.json new file mode 100644 index 000000000..2bba9724a --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/pt.json @@ -0,0 +1,7 @@ +{ + + "LOGIN" : { + "INFO_IDP_REDIRECT_PENDING" : "Por favor aguarde, redirecionando ao provedor de indentidade..." + } + +} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ru.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ru.json new file mode 100644 index 000000000..9469e6f24 --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ru.json @@ -0,0 +1,15 @@ +{ + + "DATA_SOURCE_CAS" : { + "NAME" : "Бэкенд CAS SSO" + }, + + "DATA_SOURCE_OPENID" : { + "NAME" : "Бэкенд OpenID SSO" + }, + + "LOGIN" : { + "INFO_IDP_REDIRECT_PENDING" : "Пожалуйста, подождите. Переадресую на страницу аутентификации..." + } + +} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/zh.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/zh.json new file mode 100644 index 000000000..9d02684c5 --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/zh.json @@ -0,0 +1,15 @@ +{ + + "DATA_SOURCE_CAS" : { + "NAME" : "CAS SSO后端" + }, + + "DATA_SOURCE_OPENID" : { + "NAME" : "OpenID SSO后端" + }, + + "LOGIN" : { + "INFO_IDP_REDIRECT_PENDING" : "请稍候，正在重定向到身份提供者..." + } + +} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java index 8150f97b3..98fc6615f 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java @@ -87,7 +87,7 @@ public class AuthenticationProviderService { new CASTicketField( confService.getAuthorizationEndpoint(), confService.getRedirectURI(), - new TranslatableMessage("LOGIN.INFO_CAS_REDIRECT_PENDING") + new TranslatableMessage("LOGIN.INFO_IDP_REDIRECT_PENDING") ) })) diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ca.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ca.json deleted file mode 100644 index 36b99e748..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ca.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "DATA_SOURCE_CAS" : { - "NAME" : "Backend d'inici de sessió unificat (SSO) CAS" - }, - - "LOGIN" : { - "INFO_CAS_REDIRECT_PENDING" : "Espereu, redireccionant a l'autenticació CAS ..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/de.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/de.json deleted file mode 100644 index d9519a77c..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/de.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_CAS" : { - "NAME" : "CAS SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_TICKET" : "", - "INFO_CAS_REDIRECT_PENDING" : "Bitte warten, Sie werden zur CAS-Authentifizierung weitergeleitet..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/en.json deleted file mode 100644 index 29d1363f9..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/en.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_CAS" : { - "NAME" : "CAS SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_TICKET" : "", - "INFO_CAS_REDIRECT_PENDING" : "Please wait, redirecting to CAS authentication..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/fr.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/fr.json deleted file mode 100644 index 5177772df..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/fr.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_CAS" : { - "NAME" : "CAS SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_TICKET" : "", - "INFO_CAS_REDIRECT_PENDING" : "Veuillez patienter, redirection vers l'authentification CAS..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ja.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ja.json deleted file mode 100644 index 2afdb76e3..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ja.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - - "LOGIN" : { - "INFO_CAS_REDIRECT_PENDING" : "CAS認証にリダイレクトしています。" - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ko.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ko.json deleted file mode 100644 index 0be22f66b..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ko.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - - "LOGIN" : { - "INFO_CAS_REDIRECT_PENDING" : "기다려주십시오. CAS 인증으로 리디렉션 중..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/pt.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/pt.json deleted file mode 100644 index 263fea7ce..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/pt.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_CAS" : { - "NAME" : "CAS SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_TICKET" : "", - "INFO_CAS_REDIRECT_PENDING" : "Por favor aguarde, redirecionando para autenticação CAS..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ru.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ru.json deleted file mode 100644 index 9604b6f0f..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ru.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "DATA_SOURCE_CAS" : { - "NAME" : "Бэкенд CAS SSO" - }, - - "LOGIN" : { - "INFO_CAS_REDIRECT_PENDING" : "Пожалуйста, подождите. Переадресую на страницу аутентификации CAS..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/zh.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/zh.json deleted file mode 100644 index 81491de86..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/zh.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_CAS" : { - "NAME" : "CAS SSO后端" - }, - - "LOGIN" : { - "FIELD_HEADER_TICKET" : "", - "INFO_CAS_REDIRECT_PENDING" : "请稍候，正在重定向到CAS验证..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java index bed1908d3..ba151dc48 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java @@ -131,7 +131,7 @@ public class AuthenticationProviderService { confService.getClientID(), confService.getRedirectURI(), nonceService.generate(confService.getMaxNonceValidity() * 60000L), - new TranslatableMessage("LOGIN.INFO_OID_REDIRECT_PENDING") + new TranslatableMessage("LOGIN.INFO_IDP_REDIRECT_PENDING") ) })) diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ca.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ca.json deleted file mode 100644 index b1b8b5b3b..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ca.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_OPENID" : { - "NAME" : "OpenID SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_ID_TOKEN" : "", - "INFO_OID_REDIRECT_PENDING" : "Espereu, redirigint al proveïdor d'identitat ..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/en.json deleted file mode 100644 index d88c24a47..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/en.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_OPENID" : { - "NAME" : "OpenID SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_ID_TOKEN" : "", - "INFO_OID_REDIRECT_PENDING" : "Please wait, redirecting to identity provider..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/fr.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/fr.json deleted file mode 100644 index a8d45e6d2..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/fr.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_OPENID" : { - "NAME" : "OpenID SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_ID_TOKEN" : "", - "INFO_OID_REDIRECT_PENDING" : "Veuillez patienter, redirection vers le fournisseur d'identité..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ja.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ja.json deleted file mode 100644 index d089ad573..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ja.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - - "LOGIN" : { - "INFO_OID_REDIRECT_PENDING" : "IDプロバイダへリダイレクトしています。" - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ko.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ko.json deleted file mode 100644 index b8039da01..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ko.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - - "LOGIN" : { - "INFO_OID_REDIRECT_PENDING" : "잠시만 기다려주십시오. ID 제공자로 리디렉션 중..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/pt.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/pt.json deleted file mode 100644 index 82fe30fca..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/pt.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_OPENID" : { - "NAME" : "OpenID SSO Backend" - }, - - "LOGIN" : { - "FIELD_HEADER_ID_TOKEN" : "", - "INFO_OID_REDIRECT_PENDING" : "Por favor aguarde, redirecionando ao provedor de indentidade..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ru.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ru.json deleted file mode 100644 index 4b5c0610a..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ru.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "DATA_SOURCE_OPENID" : { - "NAME" : "Бэкенд OpenID SSO" - }, - - "LOGIN" : { - "INFO_REDIRECT_PENDING" : "Пожалуйста, подождите. Переадресую на страницу аутентификации..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/zh.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/zh.json deleted file mode 100644 index a903eb44d..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/zh.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_OPENID" : { - "NAME" : "OpenID SSO后端" - }, - - "LOGIN" : { - "FIELD_HEADER_ID_TOKEN" : "", - "INFO_REDIRECT_PENDING" : "请稍候，正在重定向到身份提供者..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java index b579edc33..07bfdcc6e 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java @@ -110,7 +110,7 @@ public class AuthenticationProviderService { URI authUri = saml.createRequest(); throw new GuacamoleInsufficientCredentialsException("Redirecting to SAML IdP.", new CredentialsInfo(Arrays.asList(new Field[] { - new RedirectField("samlRedirect", authUri, new TranslatableMessage("LOGIN.INFO_SAML_REDIRECT_PENDING")) + new RedirectField("samlRedirect", authUri, new TranslatableMessage("LOGIN.INFO_IDP_REDIRECT_PENDING")) })) ); diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json index 931107820..ae1a67571 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json @@ -11,10 +11,14 @@ "translations" : [ "translations/ca.json", + "translations/de.json", "translations/en.json", - "translations/ko.json", "translations/fr.json", - "translations/pt.json" + "translations/ja.json", + "translations/ko.json", + "translations/pt.json", + "translations/ru.json", + "translations/zh.json" ] } diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ca.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ca.json deleted file mode 100644 index eef43e680..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ca.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_SAML" : { - "NAME" : "Extensión de autenticación SAML" - }, - - "LOGIN" : { - "FIELD_HEADER_SAML" : "", - "INFO_SAML_REDIRECT_PENDING" : "Por favor espere, redirigiendo al proveedor de identidad ..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/en.json deleted file mode 100644 index b4f2d910f..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/en.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_SAML" : { - "NAME" : "SAML Authentication Extension" - }, - - "LOGIN" : { - "FIELD_HEADER_SAML" : "", - "INFO_SAML_REDIRECT_PENDING" : "Please wait, redirecting to identity provider..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/fr.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/fr.json deleted file mode 100644 index 43108d27b..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/fr.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_SAML" : { - "NAME" : "SAML Authentication Extension" - }, - - "LOGIN" : { - "FIELD_HEADER_SAML" : "", - "INFO_SAML_REDIRECT_PENDING" : "Veuillez patienter, redirection vers le fournisseur d'identité..." - } - -} diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/pt.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/pt.json deleted file mode 100644 index 20e10f6e0..000000000 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/pt.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "DATA_SOURCE_SAML" : { - "NAME" : "SAML Authentication Extension" - }, - - "LOGIN" : { - "FIELD_HEADER_SAML" : "", - "INFO_SAML_REDIRECT_PENDING" : "Por favor aguarde, redirecionando para o provedor de indentidade..." - } - -}