[MS] Change standard to member profile

client/src/components/users/TagProfile.vue

@@ -25,7 +25,7 @@ function getClassForProfile(profile: UserProfile): string {
     case UserProfile.Admin:
       return 'admin';
     case UserProfile.Standard:
-      return 'standard';
+      return 'member';
     case UserProfile.Outsider:
       return 'outsider';
     default:

client/src/locales/en-US.json

@@ -34,7 +34,7 @@
             "managerCannotUpdateManagers": "Managers cannot change the role of other managers",
             "managerCannotPromoteToManager": "Managers cannot promote to Manager",
             "managerCannotPromoteToOwner": "Managers cannot promote to Owner",
-            "sameRole": "Current role of this user",
+            "sameRole": "Current role",
             "alreadyNotShared": "Already not shared with this user"
         },
         "reader": {
@@ -55,7 +55,7 @@
         },
         "none": "Not shared",
         "members": "Member ({count}) | Members ({count})",
-        "suggestion": "Suggested users"
+        "suggestion": "Suggested"
     },
     "link": {
         "invalid": "The provided link is invalid.",
@@ -129,8 +129,8 @@
             "title": "Your organizations",
             "sortOrderAsc": "Ascending",
             "sortOrderDesc": "Descending",
-            "sortByOrganization": "Organization",
-            "sortByUserName": "User Name",
+            "sortByOrganization": "Organization name",
+            "sortByUserName": "User name",
             "sortByLastLogin": "Last login",
             "labelSortBy": "Sort by",
             "search": "Search",
@@ -661,7 +661,7 @@
             },
             "configuration": {
                 "outsidersAllowed": "External profile",
-                "userLimit": "User limit",
+                "userLimit": "User limit (excluding users with External profile)",
                 "unlimited": "Unlimited",
                 "allowed": "Enabled",
                 "forbidden": "Disabled",
@@ -916,7 +916,7 @@
         "instructions": {
             "start": {
                 "first": "In order to avoid any attack, you will have to be in direct contact with the host during the whole onboarding process.",
-                "second": "The host will have to go to Users, then Pending invitation to start the process.",
+                "second": "The host will have to go to Users, then Pending invitations to start the process.",
                 "greeter": "You will be welcomed into the organization {organizationName} by {greeter} <{greeterEmail}>."
             },
             "finish": {
@@ -982,7 +982,7 @@
                 "description": "Can manage the organization"
             },
             "standard": {
-                "label": "Standard",
+                "label": "Member",
                 "description": "Can create workspaces."
             },
             "outsider": {
@@ -1006,7 +1006,7 @@
         },
         "emptyList": "No user to display.",
         "noMatch": "No users matching your filters.",
-        "listUsersFailed": "Failed to retrieve the users list. Please make sure you are online.",
+        "listUsersFailed": "Failed to retrieve users for this organization. Please make sure you are online.",
         "userSelectedCount": "No user selected | One user selected | {count} users selected",
         "userContextMenu": {
             "titleRemove": "Deletion",
@@ -1026,8 +1026,8 @@
                 "summary": "User has been added successfully!"
             },
             "subtitles": {
-                "waitForGuest1": "To onboard a new user, you have to be in direct contact with them during the onboarding process (around 2 minutes).",
-                "waitForGuest2": "Please do not close this window during the onboarding process.",
+                "waitForGuest1": "To greet a new user, you have to be in direct contact with them during the greeting process (around 2 minutes).",
+                "waitForGuest2": "Please do not close this window during the greeting process.",
                 "provideHostCode": "Give the code below to the guest.",
                 "getGuestCode": "Click on the code given to you by the guest.",
                 "getUserInfo": "Please wait while the guest enters their contact details. You will have to review them.",
@@ -1073,9 +1073,9 @@
             "rejectUser": "Cancel",
             "inviteSuccessMailSent": "An invitation to join the organization has been sent to {email}.",
             "inviteSuccessNoMail": "The invitation was successfully created but we failed to send an email to {email}. Please send the invitation link yourself or try again.",
-            "inviteFailedAlreadyMember": "The email {email} is already used by a member of this organization.",
+            "inviteFailedAlreadyMember": "The email {email} is already used by someone in this organization.",
             "inviteFailedOffline": "Failed to connect to the server. Please make sure you are online.",
-            "inviteFailedNotAllowed": "Only an administrator can invite new users into the organization.",
+            "inviteFailedNotAllowed": "Only administrators can invite new users into the organization.",
             "inviteFailedUnknown": "An unexpected error occurred, please try again (reason: {reason}).",
             "cancelSuccess": "Invitation has been cancelled.",
             "cancelFailed": "Failed to cancel invitation",
@@ -1138,7 +1138,7 @@
             "status": "Status",
             "profile": "Profile",
             "admin": "Administrator",
-            "standard": "Standard",
+            "standard": "Member",
             "outsider": "External"
         },
         "assignRoles": {
@@ -1485,7 +1485,7 @@
                 "storage": "Used storage"
             },
             "admin": "Administrators | Administrator | Administrators",
-            "standard": "Standards | Standard | Standards",
+            "standard": "Members | Member | Members",
             "outsider": "Externals | External | Externals",
             "consumptionDetail": "Consumption detail",
             "nonPaying": "Non paying",
@@ -1545,12 +1545,12 @@
             "information": "Information",
             "startingDate": "Starting date",
             "endingDate": "Ending date",
-            "members": {
-                "title": "License member | Licenses members",
-                "admin": "Administrator member | Administrator members",
+            "users": {
+                "title": "User licence | User licences",
+                "admin": "Administrator | Administrators",
                 "adminDescription": "Full access",
-                "standard": "Standard member | Standard members",
-                "external": "External member | External members",
+                "standard": "Member | Members",
+                "external": "External | Externals",
                 "externalDescription": "Limited use"
             },
             "storage": {
@@ -1670,7 +1670,7 @@
                 "unavailable": "Unavailable"
             },
             "user": {
-                "standard": "Standard | Standards",
+                "standard": "Member | Members",
                 "admin": "Administrator | Administrators",
                 "external": "External | Externals",
                 "remaining": "{number} remaining",

client/src/locales/fr-FR.json

@@ -34,7 +34,7 @@
             "managerCannotUpdateManagers": "Les Gérants ne peuvent pas changer le rôle d'autres Gérants",
             "managerCannotPromoteToManager": "Les Gérants ne peuvent pas promouvoir au rôle de Gérant",
             "managerCannotPromoteToOwner": "Les Gérants ne peuvent pas promouvoir au rôle de Propriétaire",
-            "sameRole": "Rôle actuel de l'utilisateur",
+            "sameRole": "Rôle actuel",
             "alreadyNotShared": "Déjà non partagé avec cet utilisateur"
         },
         "reader": {
@@ -55,7 +55,7 @@
         },
         "none": "Non partagé",
         "members": "Membre ({count}) | Membres ({count})",
-        "suggestion": "Suggestions d'utilisateurs"
+        "suggestion": "Recommandés"
     },
     "link": {
         "invalid": "Le lien fourni n'est pas valide.",
@@ -129,7 +129,7 @@
             "title": "Vos organisations",
             "sortOrderAsc": "Croissant",
             "sortOrderDesc": "Décroissant",
-            "sortByOrganization": "Organisation",
+            "sortByOrganization": "Nom de l'organisation",
             "sortByUserName": "Nom d'utilisateur",
             "sortByLastLogin": "Dernière connexion",
             "labelSortBy": "Trier par",
@@ -661,7 +661,7 @@
             },
             "configuration": {
                 "outsidersAllowed": "Profil externe",
-                "userLimit": "Limite d'utilisateurs",
+                "userLimit": "Limite du nombre d'utilisateurs (hors utilisateurs avec un profil Externe)",
                 "unlimited": "Illimitée",
                 "allowed": "Activé",
                 "forbidden": "Désactivé",
@@ -916,7 +916,7 @@
         "instructions": {
             "start": {
                 "first": "Afin d'éviter toute attaque, vous devez être en contact direct avec la personne durant toute la durée du processus d'accueil.",
-                "second": "L'hôte devra se rendre dans Utilisateurs puis Invitation en cours pour commencer le processus.",
+                "second": "L'hôte devra se rendre dans Utilisateurs puis Invitations en cours pour commencer le processus.",
                 "greeter": "Vous serez accueilli(e) dans l'organisation {organizationName} par {greeter} <{greeterEmail}>."
             },
             "finish": {
@@ -982,7 +982,7 @@
                 "description": "Peut gérer l'organisation."
             },
             "standard": {
-                "label": "Standard",
+                "label": "Membre",
                 "description": "Peut créer des espaces de travail et partager des fichiers."
             },
             "outsider": {
@@ -1006,7 +1006,7 @@
         },
         "emptyList": "Aucun utilisateur à afficher.",
         "noMatch": "Aucun utilisateur ne correspond à vos filtres.",
-        "listUsersFailed": "Impossible d'obtenir la liste des utilisateurs. Veuillez vérifier votre connexion internet.",
+        "listUsersFailed": "Impossible d'obtenir les utilisateurs de l'organisation. Veuillez vérifier votre connexion internet.",
         "userSelectedCount": "Aucun utilisateur sélectionné | Un utilisateur sélectionné | {count} utilisateurs sélectionnés",
         "userContextMenu": {
             "titleRemove": "Suppression",
@@ -1073,7 +1073,7 @@
             "rejectUser": "Annuler",
             "inviteSuccessMailSent": "Une invitation a été envoyée à {email}.",
             "inviteSuccessNoMail": "L'invitation a été créée mais l'email n'a pas pu être envoyé. Veuillez transmettre le lien d'invitation manuellement.",
-            "inviteFailedAlreadyMember": "L'email {email} est déjà utilisé par un membre de cette organisation.",
+            "inviteFailedAlreadyMember": "L'email {email} est déjà utilisé par un autre utilisateur dans cette organisation.",
             "inviteFailedOffline": "Impossible de contacter le serveur. Veuillez vérifier votre connexion internet.",
             "inviteFailedNotAllowed": "Seuls les administrateurs peuvent inviter de nouvelles personnes à rejoindre l'organisation.",
             "inviteFailedUnknown": "Une erreur imprévue est survenue (raison : {reason}).",
@@ -1138,7 +1138,7 @@
             "status": "État",
             "profile": "Profil",
             "admin": "Administrateur",
-            "standard": "Standard",
+            "standard": "Membre",
             "outsider": "Externe"
         },
         "assignRoles": {
@@ -1485,7 +1485,7 @@
                 "storage": "Stockage utilisé"
             },
             "admin": "Administrateur | Administrateur | Administrateurs",
-            "standard": "Standard | Standard | Standards",
+            "standard": "Membres | Membre | Membres",
             "outsider": "Externe | Externe | Externes",
             "consumptionDetail": "Détail des consommations",
             "nonPaying": "Non payant",
@@ -1545,12 +1545,12 @@
             "information": "Informations",
             "startingDate": "Date de début",
             "endingDate": "Date de fin",
-            "members": {
-                "title": "Licence membre | Licences membres",
-                "admin": "Membre administrateur | Membres administrateurs",
+            "users": {
+                "title": "Licence utilisateur | Licences utilisateur",
+                "admin": "Administrateur | Administrateurs",
                 "adminDescription": "Tous les accès",
-                "standard": "Membre standard | Membres standards",
-                "external": "Membre externe | Membres externes",
+                "standard": "Membre | Membres",
+                "external": "Externe | Externes",
                 "externalDescription": "Accès limité"
             },
             "storage": {
@@ -1670,7 +1670,7 @@
                 "unavailable": "Non disponible"
             },
             "user": {
-                "standard": "Standard | Standards",
+                "standard": "Membre | Membres",
                 "admin": "Administrateur | Administrateurs",
                 "external": "Externe | Externes",
                 "remaining": "{number} restant | {number} restants",

client/src/theme/components/tags.scss

@@ -10,7 +10,7 @@
     color: var(--parsec-color-tags-indigo-700);
   }
 
-  .standard {
+  .member {
     background-color: var(--parsec-color-tags-blue-50);
     color: var(--parsec-color-tags-blue-700);
   }

client/src/views/client-area/contracts/ContractsPage.vue

@@ -116,7 +116,7 @@
               <ion-title class="item-header__title title-h4">
                 {{
                   $msTranslate({
-                    key: 'clientArea.invoicesCustomOrder.members.title',
+                    key: 'clientArea.invoicesCustomOrder.users.title',
                     count: contractDetails.administrators.quantityOrdered,
                   })
                 }}
@@ -128,13 +128,13 @@
                   <ion-text class="data-text__title subtitles-normal">
                     {{
                       $msTranslate({
-                        key: 'clientArea.invoicesCustomOrder.members.admin',
+                        key: 'clientArea.invoicesCustomOrder.users.admin',
                         count: contractDetails.administrators.quantityOrdered,
                       })
                     }}
                   </ion-text>
                   <ion-text class="data-text__description body">
-                    {{ $msTranslate('clientArea.invoicesCustomOrder.members.adminDescription') }}
+                    {{ $msTranslate('clientArea.invoicesCustomOrder.users.adminDescription') }}
                   </ion-text>
                 </div>
                 <ion-text class="data-number title-h2">{{ contractDetails.administrators.quantityOrdered }}</ion-text>
@@ -144,7 +144,7 @@
                   <ion-text class="data-text__title subtitles-normal">
                     {{
                       $msTranslate({
-                        key: 'clientArea.invoicesCustomOrder.members.standard',
+                        key: 'clientArea.invoicesCustomOrder.users.standard',
                         count: contractDetails.standards.quantityOrdered,
                       })
                     }}
@@ -155,10 +155,10 @@
               <div class="item-content-row">
                 <div class="data-text">
                   <ion-text class="data-text__title subtitles-normal">
-                    {{ $msTranslate('clientArea.invoicesCustomOrder.members.external') }}
+                    {{ $msTranslate('clientArea.invoicesCustomOrder.users.external') }}
                   </ion-text>
                   <ion-text class="data-text__description body">
-                    {{ $msTranslate('clientArea.invoicesCustomOrder.members.externalDescription') }}
+                    {{ $msTranslate('clientArea.invoicesCustomOrder.users.externalDescription') }}
                   </ion-text>
                 </div>
                 <ion-text class="data-number title-h2">{{ contractDetails.outsiders.quantityOrdered }}</ion-text>
@@ -251,7 +251,7 @@
           </div>
           <!-- standards-->
           <div
-            class="organization-users-item standards"
+            class="organization-users-item members"
             v-if="organizationStats.standardUsersDetail"
           >
             <ion-text class="item-title title-h4">
@@ -843,7 +843,7 @@ function getStoragePercentage(): number {
     }
   }
 
-  .standards {
+  .members {
     .progress-bar-used {
       width: v-bind(progressWidthStandard);
     }

client/tests/e2e/specs/client_area_custom_order_contract.spec.ts

@@ -35,7 +35,7 @@ msTest('Test initial status', async ({ clientAreaCustomOrder }) => {
   const admins = org.locator('.admins');
   await expect(admins.locator('.item-active__number')).toHaveText('4 / 32 members');
   await expect(admins.locator('.progress-text')).toHaveText('28 remaining');
-  const standards = org.locator('.standards');
+  const standards = org.locator('.members');
   await expect(standards.locator('.item-active__number')).toHaveText('54 / 50 members');
   await expect(standards.locator('.progress-text')).toHaveText('0 remaining');
   const externals = org.locator('.externals');

client/tests/e2e/specs/client_area_custom_order_statistics.spec.ts

@@ -10,11 +10,11 @@ msTest('Test initial status', async ({ clientAreaCustomOrder }) => {
   const page = clientAreaCustomOrder.locator('.client-page-statistics');
   const active = page.locator('.users-cards-list').nth(0);
   const activeUserItems = active.locator('.users-cards-list-item').locator('.users-cards-list-item-text');
-  await expect(activeUserItems).toHaveText(['4Administrators', '54Standards', '1External']);
+  await expect(activeUserItems).toHaveText(['4Administrators', '54Members', '1External']);
 
   const revoked = page.locator('.users-cards-list').nth(1);
   const revokedUserItems = revoked.locator('.users-cards-list-item').locator('.users-cards-list-item-text');
-  await expect(revokedUserItems).toHaveText(['1Administrator', '1Standard', '142Externals']);
+  await expect(revokedUserItems).toHaveText(['1Administrator', '1Member', '142Externals']);
 
   const storage = page.locator('.storage-data');
   const storageGlobal = storage.locator('.storage-data-global');

client/tests/e2e/specs/home_page.spec.ts

@@ -6,7 +6,7 @@ const USER_NAMES = ['Alicey McAliceFace', 'Boby McBobFace', 'Malloryy McMalloryF
 
 msTest('Home default state with devices', async ({ home }) => {
   await expect(home.locator('.organization-title')).toHaveText('Your organizations');
-  await expect(home.locator('#organization-filter-select')).toHaveText('Organization');
+  await expect(home.locator('#organization-filter-select')).toHaveText('Organization name');
   await expect(home.locator('#create-organization-button')).toHaveText('Create or join');
   await expect(home.locator('#search-input-organization')).toBeVisible();
   const cards = home.locator('.organization-list').locator('.organization-card');
@@ -28,7 +28,7 @@ msTest('Sort devices', async ({ home }) => {
   await sortBy(sortButton, 'Ascending');
   // Should not change anything right now because all devices have the same organization
   await expect(cards.locator('.organization-card-login__name')).toHaveText(USER_NAMES.sort((u1, u2) => u1.localeCompare(u2)));
-  await sortBy(sortButton, 'Name');
+  await sortBy(sortButton, 'User name');
   // By name desc
   await expect(cards.locator('.organization-card-login__name')).toHaveText(USER_NAMES.sort((u1, u2) => u2.localeCompare(u1)));
   await sortBy(sortButton, 'Descending');

client/tests/e2e/specs/invitations_popover.spec.ts

@@ -80,5 +80,5 @@ msTest('Invite user with already existing email', async ({ connected }) => {
   await popover.locator('.invitations-list-header__button').click();
   await expect(connected).toBeUserPage();
   await fillInputModal(connected, '[email protected]');
-  await expect(connected).toShowToast('The email [email protected] is already used by a member of this organization.', 'Error');
+  await expect(connected).toShowToast('The email [email protected] is already used by someone in this organization.', 'Error');
 });