From c115ae374ec77d1be8f47400c12310bd3f55fcf5 Mon Sep 17 00:00:00 2001 From: Miguel Cabrerizo <30386061+doncicuto@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:15:39 +0200 Subject: [PATCH] feat: replace inactive remove active from select account (#6364) * feat: replace inactive remove active from select account * fix: apply same behavior to console user select --------- Co-authored-by: Livio Spring --- .../accounts-card/accounts-card.component.html | 11 +++-------- internal/api/ui/login/static/i18n/bg.yaml | 2 +- internal/api/ui/login/static/i18n/de.yaml | 2 +- internal/api/ui/login/static/i18n/en.yaml | 2 +- internal/api/ui/login/static/i18n/es.yaml | 2 +- internal/api/ui/login/static/i18n/fr.yaml | 2 +- internal/api/ui/login/static/i18n/it.yaml | 2 +- internal/api/ui/login/static/i18n/ja.yaml | 2 +- internal/api/ui/login/static/i18n/mk.yaml | 2 +- internal/api/ui/login/static/i18n/pl.yaml | 2 +- internal/api/ui/login/static/i18n/pt.yaml | 2 +- internal/api/ui/login/static/i18n/zh.yaml | 2 +- .../api/ui/login/static/templates/select_user.html | 2 ++ 13 files changed, 16 insertions(+), 19 deletions(-) diff --git a/console/src/app/modules/accounts-card/accounts-card.component.html b/console/src/app/modules/accounts-card/accounts-card.component.html index b4a9439c36..1ed1649545 100644 --- a/console/src/app/modules/accounts-card/accounts-card.component.html +++ b/console/src/app/modules/accounts-card/accounts-card.component.html @@ -31,14 +31,9 @@
{{ session.displayName ? session.displayName : session.userName }} {{ session.loginName }} - {{ 'USER.STATE.' + session.authState | translate }} + {{ + 'USER.STATE.' + session.authState | translate + }}
keyboard_arrow_right diff --git a/internal/api/ui/login/static/i18n/bg.yaml b/internal/api/ui/login/static/i18n/bg.yaml index 819073c5de..8e834db180 100644 --- a/internal/api/ui/login/static/i18n/bg.yaml +++ b/internal/api/ui/login/static/i18n/bg.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: 'Изберете своя акаунт, който да свържете с вашия външен потребител.' OtherUser: Друг потребител SessionState0: активен - SessionState1: неактивен + SessionState1: Не сте в профила си MustBeMemberOfOrg: 'Потребителят трябва да е член на {{.OrgName}} организация.' Password: Title: Парола diff --git a/internal/api/ui/login/static/i18n/de.yaml b/internal/api/ui/login/static/i18n/de.yaml index 28be4b68b6..921026a1a9 100644 --- a/internal/api/ui/login/static/i18n/de.yaml +++ b/internal/api/ui/login/static/i18n/de.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Wähle dein Konto, um dieses mit deinem externen Benutzerkonto zu verbinden. OtherUser: Anderer Benutzer SessionState0: aktiv - SessionState1: inaktiv + SessionState1: Abgemeldet MustBeMemberOfOrg: Der Benutzer muss der Organisation {{.OrgName}} angehören. Password: diff --git a/internal/api/ui/login/static/i18n/en.yaml b/internal/api/ui/login/static/i18n/en.yaml index 120d7651a2..99958d7563 100644 --- a/internal/api/ui/login/static/i18n/en.yaml +++ b/internal/api/ui/login/static/i18n/en.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Select your account to link with your external user. OtherUser: Other User SessionState0: active - SessionState1: inactive + SessionState1: Signed out MustBeMemberOfOrg: The user must be member of the {{.OrgName}} organization. Password: diff --git a/internal/api/ui/login/static/i18n/es.yaml b/internal/api/ui/login/static/i18n/es.yaml index 67ec475db4..98847b67a8 100644 --- a/internal/api/ui/login/static/i18n/es.yaml +++ b/internal/api/ui/login/static/i18n/es.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Selecciona tu cuenta para vincular con tu usuario externo. OtherUser: Otro Usuario SessionState0: activo - SessionState1: inactivo + SessionState1: Se ha cerrado la sesión MustBeMemberOfOrg: El usuario debe ser miembro de la organización {{.OrgName}}. Password: diff --git a/internal/api/ui/login/static/i18n/fr.yaml b/internal/api/ui/login/static/i18n/fr.yaml index b39bb2cf98..ebc87dfebe 100644 --- a/internal/api/ui/login/static/i18n/fr.yaml +++ b/internal/api/ui/login/static/i18n/fr.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Sélectionnez votre compte pour établir un lien avec votre utilisateur externe. OtherUser: Autre utilisateur SessionState0: actif - SessionState1: inactif + SessionState1: Déconnecté MustBeMemberOfOrg: L'utilisateur doit être membre de l'organisation {{.OrgName}}. Password: diff --git a/internal/api/ui/login/static/i18n/it.yaml b/internal/api/ui/login/static/i18n/it.yaml index 9430a8ed30..1fffcee7fc 100644 --- a/internal/api/ui/login/static/i18n/it.yaml +++ b/internal/api/ui/login/static/i18n/it.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Seleziona il tuo account da collegare al tuo utente esterno. OtherUser: Altro utente SessionState0: attivo - SessionState1: inattivo + SessionState1: Disconnesso MustBeMemberOfOrg: "L'utente deve essere membro dell'organizzazione {{.OrgName}}." Password: diff --git a/internal/api/ui/login/static/i18n/ja.yaml b/internal/api/ui/login/static/i18n/ja.yaml index 7693d50e1e..fe58a191f2 100644 --- a/internal/api/ui/login/static/i18n/ja.yaml +++ b/internal/api/ui/login/static/i18n/ja.yaml @@ -18,7 +18,7 @@ SelectAccount: DescriptionLinking: アカウントを選択して、外部ユーザーにリンクします。 OtherUser: その他のユーザー SessionState0: アクティブ - SessionState1: 非アクティブ + SessionState1: ログアウトしました MustBeMemberOfOrg: ユーザーは組織 {{.OrgName}} のメンバーである必要があります。 Password: diff --git a/internal/api/ui/login/static/i18n/mk.yaml b/internal/api/ui/login/static/i18n/mk.yaml index d0107dec6c..6db9dea24a 100644 --- a/internal/api/ui/login/static/i18n/mk.yaml +++ b/internal/api/ui/login/static/i18n/mk.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Изберете ја вашата корисничка сметка за да ја поврзете со вашиот надворешен корисник. OtherUser: Друг корисник SessionState0: активна - SessionState1: неактивна + SessionState1: Одјавени MustBeMemberOfOrg: Корисникот мора да биде член на организацијата {{.OrgName}}. Password: diff --git a/internal/api/ui/login/static/i18n/pl.yaml b/internal/api/ui/login/static/i18n/pl.yaml index 963e0d038a..4cc7e222f6 100644 --- a/internal/api/ui/login/static/i18n/pl.yaml +++ b/internal/api/ui/login/static/i18n/pl.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Wybierz swoje konto, aby połączyć je z twoim zewnętrznym użytkownikiem. OtherUser: Inny użytkownik SessionState0: aktywne - SessionState1: nieaktywne + SessionState1: Wylogowano MustBeMemberOfOrg: Użytkownik musi być członkiem organizacji {{.OrgName}}. Password: diff --git a/internal/api/ui/login/static/i18n/pt.yaml b/internal/api/ui/login/static/i18n/pt.yaml index 3b32b21785..9b50f7087c 100644 --- a/internal/api/ui/login/static/i18n/pt.yaml +++ b/internal/api/ui/login/static/i18n/pt.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: Selecione sua conta para vincular com seu usuário externo. OtherUser: Outro usuário SessionState0: ativo - SessionState1: inativo + SessionState1: Sem sessão iniciada MustBeMemberOfOrg: O usuário deve ser membro da organização {{.OrgName}}. Password: diff --git a/internal/api/ui/login/static/i18n/zh.yaml b/internal/api/ui/login/static/i18n/zh.yaml index 315eed8dc4..1b02b36705 100644 --- a/internal/api/ui/login/static/i18n/zh.yaml +++ b/internal/api/ui/login/static/i18n/zh.yaml @@ -25,7 +25,7 @@ SelectAccount: DescriptionLinking: 选择您的帐户以与您的外部用户关联。 OtherUser: 其他用户 SessionState0: 启用 - SessionState1: 停用 + SessionState1: 未登入 MustBeMemberOfOrg: 用户必须是 {{.OrgName}} 组织的成员。 Password: diff --git a/internal/api/ui/login/static/templates/select_user.html b/internal/api/ui/login/static/templates/select_user.html index a656d0d87d..5a0e1fe090 100644 --- a/internal/api/ui/login/static/templates/select_user.html +++ b/internal/api/ui/login/static/templates/select_user.html @@ -42,7 +42,9 @@

{{$user.DisplayName}}

{{if and $displayLoginNameSuffix $user.SelectionPossible}}{{$user.UserName}}{{else}}{{$user.LoginName}}{{end}}

+ {{if $user.UserSessionState }}

{{t $sessionState}}

+ {{end}}