Differentiate in new locales

OpenConext · Sep 7, 2023 · f50b6c2 · f50b6c2
1 parent df58d5d
commit f50b6c2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/client/src/locale/en.js b/client/src/locale/en.js
@@ -41,7 +41,8 @@ const en = {
         home: "Home",
         applications: "Applications",
         users: "Users",
-        guest: "Guests",
+        maintainers: "Maintainers",
+        guests: "Guests",
         invitations: "Invitations",
         roles: "Roles",
         profile: "Profile",
@@ -159,6 +160,7 @@ const en = {
         enforceEmailEquality: "Email equality",
         eduIDOnly: "eduID only",
         new: "Invite maintainer",
+        newInvite: "New invite",
         newGuest: "Invite guest",
         invitees: "Invitees",
         inviteesPlaceholder: "Invitee email addresses",

diff --git a/client/src/locale/nl.js b/client/src/locale/nl.js
@@ -41,7 +41,8 @@ const nl = {
         home: "Home",
         applications: "Applications",
         users: "Users",
-        guest: "Guests",
+        maintainers: "Maintainers",
+        guests: "Guests",
         invitations: "Invitations",
         roles: "Roles",
         profile: "Profile",
@@ -159,6 +160,7 @@ const nl = {
         enforceEmailEquality: "Email equality",
         eduIDOnly: "eduID only",
         new: "Invite maintainer",
+        newInvite: "New invite",
         newGuest: "Invite guest",
         invitees: "Invitees",
         inviteesPlaceholder: "Invitee email addresses",

diff --git a/client/src/pages/Role.js b/client/src/pages/Role.js
@@ -48,8 +48,8 @@ export const Role = () => {
                 setRole(res[0]);
                 setLoading(false);
                 const newTabs = [
-                    <Page key="users"
-                          name="users"
+                    <Page key="maintainers"
+                          name="maintainers"
                           label={I18n.t("tabs.userRoles")}
                           Icon={UserLogo}>
                         <UserRoles role={res[0]}

diff --git a/client/src/tabs/Invitations.js b/client/src/tabs/Invitations.js
@@ -247,7 +247,7 @@ export const Invitations = ({role, preloadedInvitations, standAlone = false}) =>
                   defaultSort="name"
                   columns={columns}
                   title={title}
-                  newLabel={I18n.t("invitations.new")}
+                  newLabel={I18n.t("invitations.newInvite")}
                   showNew={!!role}
                   newEntityFunc={role ? () => navigate("/invitation/new", {state: role.id}) : null}
                   hideTitle={true}

diff --git a/client/src/tabs/UserRoles.js b/client/src/tabs/UserRoles.js
@@ -15,7 +15,7 @@ import {deleteUserRole, updateUserRoleEndData} from "../api";
 import {isEmpty, pseudoGuid} from "../utils/Utils";
 
 
-export const UserRoles = ({role, guest, userRoles}) => {
+export const UserRoles = ({role, guests, userRoles}) => {
     const navigate = useNavigate();
     const {user, setFlash} = useAppStore(state => state);
 
@@ -231,7 +231,7 @@ export const UserRoles = ({role, guest, userRoles}) => {
                   modelName="userRoles"
                   defaultSort="name"
                   columns={columns}
-                  newLabel={I18n.t(guest ? "invitations.newGuest": "invitations.new")}
+                  newLabel={I18n.t(guests ? "invitations.newGuest": "invitations.new")}
                   showNew={true}
                   newEntityFunc={() => navigate("/invitation/new", {state: role.id})}
                   customNoEntities={I18n.t(`userRoles.noResults`)}