diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json index e0257629b66..436d80e1d59 100644 --- a/client/src/locales/en-US.json +++ b/client/src/locales/en-US.json @@ -1064,7 +1064,8 @@ "name": "Name", "joined": "Joined", "commonWorkspaces": "Shared workspaces", - "revoked": "Revoked" + "revoked": "Revoked", + "revokedSince": "Revoked since" }, "actions": { "close": "Close" diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json index ddea86606bf..c4e14d00de5 100644 --- a/client/src/locales/fr-FR.json +++ b/client/src/locales/fr-FR.json @@ -1064,7 +1064,8 @@ "name": "Nom", "joined": "Rejoint", "commonWorkspaces": "Espaces de travail communs", - "revoked": "Révoqué" + "revoked": "Révoqué", + "revokedSince": "Révoqué depuis le" }, "actions": { "close": "Fermer" diff --git a/client/src/parsec/user.ts b/client/src/parsec/user.ts index 4dd520de44c..564f957c2f8 100644 --- a/client/src/parsec/user.ts +++ b/client/src/parsec/user.ts @@ -109,7 +109,7 @@ export async function listUsers(skipRevoked = true, pattern = ''): Promise true, isFrozen: (): boolean => false, @@ -121,7 +121,7 @@ export async function listUsers(skipRevoked = true, pattern = ''): Promise true, isFrozen: (): boolean => false, @@ -131,9 +131,9 @@ export async function listUsers(skipRevoked = true, pattern = ''): Promise true, isFrozen: (): boolean => false, diff --git a/client/src/views/users/UserDetailsModal.vue b/client/src/views/users/UserDetailsModal.vue index 8da797e6211..37b5f441435 100644 --- a/client/src/views/users/UserDetailsModal.vue +++ b/client/src/views/users/UserDetailsModal.vue @@ -11,35 +11,59 @@ }" >
-
- - {{ $msTranslate('UsersPage.UserDetailsModal.subtitles.name') }} - - - {{ user.humanHandle.label }} - +
+
+ + {{ $msTranslate('UsersPage.UserDetailsModal.subtitles.name') }} + + + {{ user.humanHandle.label }} + +
- {{ $msTranslate('UsersPage.UserDetailsModal.subtitles.revoked') }}
-
- + + +
+ + {{ $msTranslate('UsersPage.UserDetailsModal.subtitles.joined') }} - + {{ $msTranslate(formatTimeSince(user.createdOn, '--', 'short')) }}
+ + +
+ + + {{ $msTranslate('UsersPage.UserDetailsModal.subtitles.revokedSince') }} + + + {{ $msTranslate(I18n.formatDate(user.revokedOn, 'short')) }} + +
@@ -83,12 +107,12 @@