From f4c8ded5f6a8db1f1bd23285b4f04b894aa5e468 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Thu, 14 Sep 2023 11:01:15 +0200 Subject: [PATCH] Removed namespaces from messages (#23205) --- .../admin-ui/manage/groups/MoveGroupModal.ts | 2 +- .../manage/realm_settings/UserRegistration.ts | 2 +- .../public/locales/en/translation.json | 8 +++- .../public/locales/ja/translation.json | 1 + .../public/locales/zh-CN/translation.json | 2 + .../authentication/AuthenticationSection.tsx | 6 +-- .../src/authentication/BindFlowDialog.tsx | 4 +- .../src/authentication/DuplicateFlowModal.tsx | 2 +- .../src/authentication/EditFlowModal.tsx | 2 +- .../src/authentication/FlowDetails.tsx | 20 ++++------ .../src/authentication/RequiredActions.tsx | 10 ++--- .../components/AddFlowDropdown.tsx | 4 +- .../authentication/components/EditFlow.tsx | 14 +++---- .../components/ExecutionConfigModal.tsx | 12 +++--- .../authentication/components/FlowHeader.tsx | 2 +- .../src/authentication/components/FlowRow.tsx | 6 +-- .../src/authentication/components/UsedBy.tsx | 4 +- .../components/modals/AddStepModal.tsx | 6 +-- .../components/modals/AddSubFlowModal.tsx | 10 ++--- .../src/authentication/form/CreateFlow.tsx | 4 +- .../authentication/form/NameDescription.tsx | 8 ++-- .../authentication/policies/CibaPolicy.tsx | 20 +++++----- .../src/authentication/policies/OtpPolicy.tsx | 8 ++-- .../policies/PasswordPolicy.tsx | 4 +- .../src/authentication/policies/Policies.tsx | 2 +- .../src/authentication/policies/PolicyRow.tsx | 8 ++-- .../policies/WebauthnPolicy.tsx | 10 ++--- .../src/client-scopes/ClientScopesSection.tsx | 6 +-- .../src/client-scopes/CreateClientScope.tsx | 2 +- .../src/client-scopes/EditClientScope.tsx | 18 ++++----- .../src/client-scopes/add/MapperDialog.tsx | 14 +++---- .../src/client-scopes/details/MapperList.tsx | 12 +++--- .../client-scopes/details/MappingDetails.tsx | 34 ++++++++-------- .../src/client-scopes/details/ScopeForm.tsx | 20 +++++----- .../client-scopes/details/SearchFilter.tsx | 6 +-- .../src/client-scopes/routes/Mapper.tsx | 2 +- .../src/clients/ClientDescription.tsx | 10 ++--- .../admin-ui/src/clients/ClientDetails.tsx | 24 ++++++------ .../admin-ui/src/clients/ClientsSection.tsx | 16 ++++---- .../src/clients/add/CapabilityConfig.tsx | 16 ++++---- .../src/clients/add/LoginSettingsPanel.tsx | 12 +++--- .../admin-ui/src/clients/add/LogoutPanel.tsx | 12 +++--- .../src/clients/add/NewClientForm.tsx | 6 +-- .../admin-ui/src/clients/add/SamlConfig.tsx | 4 +- .../src/clients/advanced/AddHostDialog.tsx | 4 +- .../src/clients/advanced/AdvancedSettings.tsx | 20 +++++----- .../advanced/AuthenticationOverrides.tsx | 6 +-- .../src/clients/advanced/ClusteringPanel.tsx | 6 +-- .../advanced/FineGrainOpenIdConnect.tsx | 20 +++++----- .../advanced/FineGrainSamlEndpointConfig.tsx | 4 +- .../OpenIdConnectCompatibilityModes.tsx | 24 ++++++------ .../src/clients/advanced/RevocationPanel.tsx | 2 +- .../authorization/AuthorizationDataModal.tsx | 2 +- .../authorization/AuthorizationEvaluate.tsx | 12 +++--- .../authorization/AuthorizationExport.tsx | 2 +- .../authorization/DetailDescription.tsx | 2 +- .../clients/authorization/ImportDialog.tsx | 6 +-- .../authorization/KeyBasedAttributeInput.tsx | 8 ++-- .../src/clients/authorization/MoreLabel.tsx | 4 +- .../clients/authorization/NewPolicyDialog.tsx | 4 +- .../authorization/PermissionDetails.tsx | 24 ++++++------ .../src/clients/authorization/Permissions.tsx | 12 +++--- .../src/clients/authorization/Policies.tsx | 12 +++--- .../clients/authorization/ResourceDetails.tsx | 16 ++++---- .../src/clients/authorization/Resources.tsx | 10 ++--- .../authorization/ResourcesPolicySelect.tsx | 2 +- .../clients/authorization/ScopeDetails.tsx | 14 +++---- .../src/clients/authorization/ScopePicker.tsx | 4 +- .../src/clients/authorization/Scopes.tsx | 8 ++-- .../clients/authorization/SearchDropdown.tsx | 12 +++--- .../src/clients/authorization/Settings.tsx | 4 +- .../authorization/evaluate/Results.tsx | 12 +++--- .../clients/authorization/policy/Group.tsx | 2 +- .../authorization/policy/NameDescription.tsx | 8 ++-- .../authorization/policy/PolicyDetails.tsx | 8 ++-- .../clients/authorization/policy/Regex.tsx | 4 +- .../src/clients/authorization/policy/Time.tsx | 6 +-- .../src/clients/credentials/ClientSecret.tsx | 2 +- .../src/clients/credentials/Credentials.tsx | 10 ++--- .../admin-ui/src/clients/credentials/X509.tsx | 6 +-- .../src/clients/import/ImportForm.tsx | 8 ++-- .../CreateInitialAccessToken.tsx | 4 +- .../initial-access/InitialAccessTokenList.tsx | 10 ++--- .../src/clients/keys/ExportSamlKeyDialog.tsx | 4 +- .../src/clients/keys/GenerateKeyDialog.tsx | 2 +- .../src/clients/keys/ImportKeyDialog.tsx | 2 +- js/apps/admin-ui/src/clients/keys/Keys.tsx | 6 +-- .../admin-ui/src/clients/keys/SamlKeys.tsx | 14 +++---- .../src/clients/keys/SamlKeysDialog.tsx | 2 +- .../src/clients/keys/StoreSettings.tsx | 6 +-- .../registration/AddProviderDialog.tsx | 12 +++--- .../registration/ClientRegistrationList.tsx | 6 +-- .../clients/registration/DetailProvider.tsx | 12 +++--- .../admin-ui/src/clients/routes/Mapper.tsx | 2 +- .../src/clients/scopes/AddScopeDialog.tsx | 16 ++++---- .../src/clients/scopes/ClientScopes.tsx | 6 +-- .../src/clients/scopes/DecicatedScope.tsx | 4 +- .../src/clients/scopes/DedicatedScopes.tsx | 8 ++-- .../src/clients/scopes/EvaluateScopes.tsx | 6 +-- .../bread-crumb/GroupBreadCrumbs.tsx | 2 +- .../src/components/client/ClientSelect.tsx | 4 +- .../confirm-dialog/ConfirmDialog.tsx | 4 +- .../components/dynamic/BooleanComponent.tsx | 8 ++-- .../src/components/dynamic/FileComponent.tsx | 4 +- .../src/components/dynamic/GroupComponent.tsx | 9 ++--- .../src/components/dynamic/ListComponent.tsx | 4 +- .../src/components/dynamic/MapComponent.tsx | 18 ++++----- .../dynamic/MultivaluedListComponent.tsx | 8 ++-- .../dynamic/MultivaluedStringComponent.tsx | 4 +- .../components/dynamic/PasswordComponent.tsx | 4 +- .../src/components/dynamic/RoleComponent.tsx | 6 +-- .../components/dynamic/ScriptComponent.tsx | 2 +- .../components/dynamic/StringComponent.tsx | 4 +- .../src/components/dynamic/TextComponent.tsx | 4 +- .../components/group/GroupPickerDialog.tsx | 14 +++---- .../components/help-enabler/HelpHeader.tsx | 4 +- .../json-file-upload/FileUploadForm.tsx | 2 +- .../key-value-form/AttributeForm.tsx | 4 +- .../multi-line-input/MultiLineInput.tsx | 6 +-- .../permission-tab/PermissionTab.tsx | 14 +++---- .../src/components/role-form/RoleForm.tsx | 12 +++--- .../role-mapping/AddRoleMappingModal.tsx | 22 +++++------ .../components/role-mapping/RoleMapping.tsx | 18 ++++----- .../src/components/roles-list/RolesList.tsx | 6 +-- .../table-toolbar/KeycloakDataTable.tsx | 2 +- .../src/components/users/UserDataTable.tsx | 4 +- .../UserDataTableAttributeSearchForm.tsx | 12 +++--- .../src/components/users/UserSelect.tsx | 2 +- .../src/components/view-header/ViewHeader.tsx | 10 ++--- js/apps/admin-ui/src/dashboard/Dashboard.tsx | 10 ++--- .../admin-ui/src/dashboard/ProviderInfo.tsx | 2 +- .../src/dashboard/routes/Dashboard.tsx | 2 +- js/apps/admin-ui/src/events/AdminEvents.tsx | 20 +++++----- js/apps/admin-ui/src/events/EventsSection.tsx | 16 ++++---- .../admin-ui/src/groups/GroupAttributes.tsx | 2 +- js/apps/admin-ui/src/groups/GroupTable.tsx | 6 +-- js/apps/admin-ui/src/groups/GroupsModal.tsx | 8 ++-- js/apps/admin-ui/src/groups/GroupsSection.tsx | 18 ++++----- js/apps/admin-ui/src/groups/Members.tsx | 16 ++++---- js/apps/admin-ui/src/groups/MembersModal.tsx | 8 ++-- .../src/groups/components/DeleteGroup.tsx | 4 +- .../src/groups/components/GroupToolbar.tsx | 2 +- .../src/groups/components/GroupTree.tsx | 4 +- .../src/groups/components/MoveDialog.tsx | 6 +-- .../IdentityProvidersSection.tsx | 14 +++---- .../identity-providers/ManageOrderDialog.tsx | 14 +++---- .../add/AddIdentityProvider.tsx | 4 +- .../src/identity-providers/add/AddMapper.tsx | 12 +++--- .../identity-providers/add/AddMapperForm.tsx | 4 +- .../add/AddOpenIdConnect.tsx | 4 +- .../identity-providers/add/AddSamlConnect.tsx | 4 +- .../add/AdvancedSettings.tsx | 12 +++--- .../add/DescriptorSettings.tsx | 14 +++---- .../identity-providers/add/DetailSettings.tsx | 26 ++++++------- .../add/DiscoverySettings.tsx | 4 +- .../add/OIDCGeneralSettings.tsx | 2 +- .../add/SamlConnectSettings.tsx | 2 +- .../add/SamlGeneralSettings.tsx | 2 +- .../component/ClientIdSecret.tsx | 4 +- .../component/DiscoveryEndpointField.tsx | 6 +-- .../component/SwitchField.tsx | 4 +- .../src/realm-roles/CreateRealmRole.tsx | 2 +- .../src/realm-roles/RealmRoleTabs.tsx | 12 +++--- .../src/realm-roles/UsersInRoleTab.tsx | 6 +-- .../realm-settings/AddClientProfileModal.tsx | 6 +-- .../realm-settings/AddMessageBundleModal.tsx | 12 +++--- .../src/realm-settings/ClientProfileForm.tsx | 10 ++--- .../src/realm-settings/DefaultGroupsTab.tsx | 12 +++--- .../admin-ui/src/realm-settings/EmailTab.tsx | 16 ++++---- .../src/realm-settings/ExecutorForm.tsx | 4 +- .../src/realm-settings/GeneralTab.tsx | 14 +++---- .../src/realm-settings/LocalizationTab.tsx | 18 ++++----- .../admin-ui/src/realm-settings/LoginTab.tsx | 32 +++++++-------- .../realm-settings/NewAttributeSettings.tsx | 4 +- .../NewClientPolicyCondition.tsx | 4 +- .../realm-settings/NewClientPolicyForm.tsx | 14 +++---- .../src/realm-settings/PartialExport.tsx | 12 +++--- .../src/realm-settings/PartialImport.tsx | 39 +++++++++---------- .../src/realm-settings/PoliciesTab.tsx | 8 ++-- .../src/realm-settings/ProfilesTab.tsx | 4 +- .../src/realm-settings/RealmSettingsTabs.tsx | 6 +-- .../src/realm-settings/SessionsTab.tsx | 8 ++-- .../admin-ui/src/realm-settings/ThemesTab.tsx | 4 +- .../admin-ui/src/realm-settings/TokensTab.tsx | 8 ++-- .../event-config/AddEventTypesDialog.tsx | 4 +- .../event-config/EventConfigForm.tsx | 12 +++--- .../event-config/EventListenersForm.tsx | 8 ++-- .../realm-settings/event-config/EventsTab.tsx | 2 +- .../event-config/EventsTypeTable.tsx | 2 +- .../src/realm-settings/keys/KeysListTab.tsx | 4 +- .../realm-settings/keys/KeysProvidersTab.tsx | 10 ++--- .../keys/key-providers/KeyProviderForm.tsx | 8 ++-- .../security-defences/BruteForceDetection.tsx | 14 +++---- .../security-defences/HeadersForm.tsx | 4 +- .../security-defences/HelpLinkTextInput.tsx | 2 +- .../realm-settings/security-defences/Time.tsx | 2 +- .../user-profile/AttributesGroupForm.tsx | 6 +-- .../user-profile/AttributesGroupTab.tsx | 4 +- .../user-profile/AttributesTab.tsx | 6 +-- .../user-profile/JsonEditorTab.tsx | 4 +- .../attribute/AddValidatorDialog.tsx | 4 +- .../attribute/AttributeGeneralSettings.tsx | 16 ++++---- .../attribute/AttributeValidations.tsx | 4 +- .../attribute/ValidatorSelect.tsx | 2 +- .../admin-ui/src/realm/add/NewRealmForm.tsx | 10 ++--- .../admin-ui/src/sessions/RevocationModal.tsx | 2 +- .../admin-ui/src/sessions/SessionsSection.tsx | 2 +- .../admin-ui/src/sessions/SessionsTable.tsx | 8 ++-- .../user-federation/ManagePriorityDialog.tsx | 14 +++---- .../UserFederationKerberosSettings.tsx | 6 +-- .../UserFederationKerberosWizard.tsx | 2 +- .../UserFederationLdapForm.tsx | 2 +- .../UserFederationLdapSettings.tsx | 6 +-- .../UserFederationLdapWizard.tsx | 24 ++++++------ .../user-federation/UserFederationSection.tsx | 8 ++-- .../custom/CustomProviderSettings.tsx | 6 +-- .../user-federation/custom/SyncSettings.tsx | 8 ++-- .../kerberos/KerberosSettingsRequired.tsx | 12 +++--- .../ldap/LdapSettingsAdvanced.tsx | 12 +++--- .../ldap/LdapSettingsConnection.tsx | 10 ++--- .../ldap/LdapSettingsKerberosIntegration.tsx | 12 +++--- .../ldap/LdapSettingsSearching.tsx | 4 +- .../ldap/LdapSettingsSynchronization.tsx | 16 ++++---- .../ldap/mappers/LdapMapperDetails.tsx | 37 ++++++++---------- .../ldap/mappers/LdapMapperList.tsx | 22 +++++------ .../routes/NewKerberosUserFederation.tsx | 2 +- .../routes/UserFederationKerberos.tsx | 2 +- .../routes/UserFederationLdap.tsx | 2 +- .../routes/UserFederationLdapMapper.tsx | 2 +- .../user-federation/shared/ExtendedHeader.tsx | 2 +- .../src/user-federation/shared/Header.tsx | 4 +- .../user-federation/shared/SettingsCache.tsx | 14 +++---- js/apps/admin-ui/src/user/EditUser.tsx | 14 +++---- js/apps/admin-ui/src/user/UserConsents.tsx | 2 +- js/apps/admin-ui/src/user/UserCredentials.tsx | 2 +- js/apps/admin-ui/src/user/UserForm.tsx | 24 ++++++------ js/apps/admin-ui/src/user/UserGroups.tsx | 2 +- js/apps/admin-ui/src/user/UserIdPModal.tsx | 6 +-- .../src/user/UserIdentityProviderLinks.tsx | 10 ++--- js/apps/admin-ui/src/user/UsersSection.tsx | 2 +- .../src/user/components/SelectComponent.tsx | 8 +--- .../src/user/components/UserProfileGroup.tsx | 2 +- .../user-credentials/ResetPasswordDialog.tsx | 14 +++---- 243 files changed, 982 insertions(+), 1028 deletions(-) diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/groups/MoveGroupModal.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/groups/MoveGroupModal.ts index 29c49ddf5a..82b379af57 100644 --- a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/groups/MoveGroupModal.ts +++ b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/groups/MoveGroupModal.ts @@ -1,7 +1,7 @@ import ModalUtils from "../../../../util/ModalUtils"; export default class MoveGroupModal extends ModalUtils { - private moveButton = "groups:moveHere-button"; + private moveButton = "moveHere-button"; private title = ".pf-c-modal-box__title"; clickRow(groupName: string) { diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/UserRegistration.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/UserRegistration.ts index ecfdd6de63..20dce7d243 100644 --- a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/UserRegistration.ts +++ b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/UserRegistration.ts @@ -43,7 +43,7 @@ export default class UserRegistration { } export class GroupPickerDialog { - private addButton = "common:add-button"; + private addButton = "add-button"; private title = ".pf-c-modal-box__title"; clickRow(groupName: string) { diff --git a/js/apps/admin-ui/public/locales/en/translation.json b/js/apps/admin-ui/public/locales/en/translation.json index dfaa610a55..3f04da10f1 100644 --- a/js/apps/admin-ui/public/locales/en/translation.json +++ b/js/apps/admin-ui/public/locales/en/translation.json @@ -63,7 +63,7 @@ "testConnection": "Test connection", "name": "Name", "role": "Role", - "description": "description", + "description": "Description", "type": "Type", "category": "Category", "priority": "Priority", @@ -3273,6 +3273,12 @@ "clientScopesRolesScope": "If there is no role scope mapping defined, each user is permitted to use this client scope. If there are role scope mappings defined, the user must be a member of at least one of the roles.", "scopeNameHelp": "Name of the client scope. Must be unique in the realm. Name should not contain space characters as it is used as value of scope parameter", "scopeDescriptionHelp": "Description of the client scope", + "clientScopeTypes": { + "default": "Default", + "optional": "Optional", + "none": "None" + }, + "realmNameTitle": "{{name}} realm", "scopeTypeHelp": "Client scopes, which will be added as default scopes to each created client", "clientDescriptionHelp": "Specifies description of the client. For example 'My Client for TimeSheets'. Supports keys for localized values as well. For example: ${my_client_description}", "clientsClientTypeHelp": "'OpenID Connect' allows Clients to verify the identity of the End-User based on the authentication performed by an Authorization Server.'SAML' enables web-based authentication and authorization scenarios including cross-domain single sign-on (SSO) and uses security tokens containing assertions to pass information.", diff --git a/js/apps/admin-ui/public/locales/ja/translation.json b/js/apps/admin-ui/public/locales/ja/translation.json index 7458cf9b15..1b3a802d7b 100644 --- a/js/apps/admin-ui/public/locales/ja/translation.json +++ b/js/apps/admin-ui/public/locales/ja/translation.json @@ -924,6 +924,7 @@ "titleUsers": "ユーザー", "titleSessions": "セッション", "authenticationAliasHelp": "この設定の名前を設定します。", + "clientScopeTypes": { "default": "DEFAULT" }, "authenticationFlowTypeHelp": "どの種類のフォームかを設定します。", "scopeNameHelp": "クライアント・スコープの名前。レルム内でユニークでなければなりません。スコープ・パラメーターの値として使用されるため、名前には空白文字を含めないでください", "scopeDescriptionHelp": "クライアント・スコープの説明", diff --git a/js/apps/admin-ui/public/locales/zh-CN/translation.json b/js/apps/admin-ui/public/locales/zh-CN/translation.json index 515d39e13f..79df6026bd 100644 --- a/js/apps/admin-ui/public/locales/zh-CN/translation.json +++ b/js/apps/admin-ui/public/locales/zh-CN/translation.json @@ -3246,6 +3246,8 @@ "orderChangeErrorUserFed": "由于{{error}}，无法更改用户联盟供应商的优先顺序。", "authenticationAliasHelp": "配置名称", "authenticationFlowTypeHelp": "它是一种什么样的形式？", + "clientScopeTypes": { "default": "默认", "optional": "非必需", "none": "无" }, + "realmNameTitle": "{{name}} 领域", "authenticationCreateFlowHelp": "创建流程", "scopeNameHelp": "客户端作用域的名称。在领域中必须是唯一的。名称不应包含空格字符，因为它用作作用域参数的值。", "scopeDescriptionHelp": "客户作用域说明", diff --git a/js/apps/admin-ui/src/authentication/AuthenticationSection.tsx b/js/apps/admin-ui/src/authentication/AuthenticationSection.tsx index 6924211b4e..b3ee06022d 100644 --- a/js/apps/admin-ui/src/authentication/AuthenticationSection.tsx +++ b/js/apps/admin-ui/src/authentication/AuthenticationSection.tsx @@ -137,7 +137,7 @@ export default function AuthenticationSection() { {{ flow: selectedFlow ? selectedFlow.alias : "" }}. ), - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -234,7 +234,7 @@ export default function AuthenticationSection() { ...(!data.builtIn && !data.usedBy ? [ { - title: t("common:delete"), + title: t("delete"), onClick: () => { setSelectedFlow(data); toggleDeleteDialog(); @@ -258,7 +258,7 @@ export default function AuthenticationSection() { }, { name: "description", - displayKey: "common:description", + displayKey: "description", }, ]} emptyState={ diff --git a/js/apps/admin-ui/src/authentication/BindFlowDialog.tsx b/js/apps/admin-ui/src/authentication/BindFlowDialog.tsx index f5646d254c..72ea8da841 100644 --- a/js/apps/admin-ui/src/authentication/BindFlowDialog.tsx +++ b/js/apps/admin-ui/src/authentication/BindFlowDialog.tsx @@ -58,7 +58,7 @@ export const BindFlowDialog = ({ flowAlias, onClose }: BindFlowDialogProps) => { onClose={onClose} actions={[ , , ]} isOpen diff --git a/js/apps/admin-ui/src/authentication/DuplicateFlowModal.tsx b/js/apps/admin-ui/src/authentication/DuplicateFlowModal.tsx index 254b351aae..06a0fcb913 100644 --- a/js/apps/admin-ui/src/authentication/DuplicateFlowModal.tsx +++ b/js/apps/admin-ui/src/authentication/DuplicateFlowModal.tsx @@ -96,7 +96,7 @@ export const DuplicateFlowModal = ({ variant={ButtonVariant.link} onClick={toggleDialog} > - {t("common:cancel")} + {t("cancel")} , ]} isOpen diff --git a/js/apps/admin-ui/src/authentication/EditFlowModal.tsx b/js/apps/admin-ui/src/authentication/EditFlowModal.tsx index 13de5f7a66..954e9000bb 100644 --- a/js/apps/admin-ui/src/authentication/EditFlowModal.tsx +++ b/js/apps/admin-ui/src/authentication/EditFlowModal.tsx @@ -61,7 +61,7 @@ export const EditFlowModal = ({ flow, toggleDialog }: EditFlowModalProps) => { variant={ButtonVariant.link} onClick={() => toggleDialog()} > - {t("common:cancel")} + {t("cancel")} , ]} isOpen diff --git a/js/apps/admin-ui/src/authentication/FlowDetails.tsx b/js/apps/admin-ui/src/authentication/FlowDetails.tsx index 5fa11507c5..5aed406e96 100644 --- a/js/apps/admin-ui/src/authentication/FlowDetails.tsx +++ b/js/apps/admin-ui/src/authentication/FlowDetails.tsx @@ -81,7 +81,7 @@ export default function FlowDetails() { const flows = await adminClient.authenticationManagement.getFlows(); const flow = flows.find((f) => f.id === id); if (!flow) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } const executions = @@ -206,7 +206,7 @@ export default function FlowDetails() { {{ name: selectedExecution?.displayName }}. ), - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -229,7 +229,7 @@ export default function FlowDetails() { {{ flow: flow?.alias || "" }}. ), - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -275,7 +275,7 @@ export default function FlowDetails() { key="delete" onClick={() => toggleDeleteFlow()} > - {t("common:delete")} + {t("delete")} , ] : []), @@ -377,7 +377,7 @@ export default function FlowDetails() { onDragFinish={(order) => { const withoutHeaderId = order.slice(1); setLiveText( - t("common:onDragFinish", { list: dragged?.displayName }), + t("onDragFinish", { list: dragged?.displayName }), ); const change = executionList.getChange( dragged!, @@ -387,9 +387,7 @@ export default function FlowDetails() { }} onDragStart={(id) => { const item = executionList.findExecution(id)!; - setLiveText( - t("common:onDragStart", { item: item.displayName }), - ); + setLiveText(t("onDragStart", { item: item.displayName })); setDragged(item); if (!item.isCollapsed) { item.isCollapsed = true; @@ -397,11 +395,9 @@ export default function FlowDetails() { } }} onDragMove={() => - setLiveText( - t("common:onDragMove", { item: dragged?.displayName }), - ) + setLiveText(t("onDragMove", { item: dragged?.displayName })) } - onDragCancel={() => setLiveText(t("common:onDragCancel"))} + onDragCancel={() => setLiveText(t("onDragCancel"))} itemOrder={[ "header", ...executionList.order().map((ex) => ex.id!), diff --git a/js/apps/admin-ui/src/authentication/RequiredActions.tsx b/js/apps/admin-ui/src/authentication/RequiredActions.tsx index 656193f68e..aacd8c247b 100644 --- a/js/apps/admin-ui/src/authentication/RequiredActions.tsx +++ b/js/apps/admin-ui/src/authentication/RequiredActions.tsx @@ -135,12 +135,12 @@ export const RequiredActions = () => { }, { name: "enabled", - displayKey: "common:enabled", + displayKey: "enabled", cellRenderer: (row) => ( { updateAction(row.data, "enabled"); @@ -156,9 +156,9 @@ export const RequiredActions = () => { cellRenderer: (row) => ( { updateAction(row.data, "defaultAction"); diff --git a/js/apps/admin-ui/src/authentication/components/AddFlowDropdown.tsx b/js/apps/admin-ui/src/authentication/components/AddFlowDropdown.tsx index 164939ea02..0629ce0482 100644 --- a/js/apps/admin-ui/src/authentication/components/AddFlowDropdown.tsx +++ b/js/apps/admin-ui/src/authentication/components/AddFlowDropdown.tsx @@ -45,7 +45,7 @@ export const AddFlowDropdown = ({ ); return ( - + <> + } diff --git a/js/apps/admin-ui/src/authentication/components/EditFlow.tsx b/js/apps/admin-ui/src/authentication/components/EditFlow.tsx index 8092961755..8a9ea93731 100644 --- a/js/apps/admin-ui/src/authentication/components/EditFlow.tsx +++ b/js/apps/admin-ui/src/authentication/components/EditFlow.tsx @@ -45,11 +45,11 @@ export const EditFlow = ({ execution, onRowChange }: EditFlowProps) => { return ( <> - + , ]} isOpen @@ -87,9 +87,9 @@ export const EditFlow = ({ execution, onRowChange }: EditFlowProps) => { isHorizontal > { /> { {...register("description", { maxLength: { value: 255, - message: t("common:maxLength", { length: 255 }), + message: t("maxLength", { length: 255 }), }, })} /> diff --git a/js/apps/admin-ui/src/authentication/components/ExecutionConfigModal.tsx b/js/apps/admin-ui/src/authentication/components/ExecutionConfigModal.tsx index 13447949b5..e1a44924c7 100644 --- a/js/apps/admin-ui/src/authentication/components/ExecutionConfigModal.tsx +++ b/js/apps/admin-ui/src/authentication/components/ExecutionConfigModal.tsx @@ -113,10 +113,10 @@ export const ExecutionConfigModal = ({ return ( <> - + {config && ( )} diff --git a/js/apps/admin-ui/src/authentication/components/FlowHeader.tsx b/js/apps/admin-ui/src/authentication/components/FlowHeader.tsx index 23b070baaf..15b4493ab5 100644 --- a/js/apps/admin-ui/src/authentication/components/FlowHeader.tsx +++ b/js/apps/admin-ui/src/authentication/components/FlowHeader.tsx @@ -16,7 +16,7 @@ export const FlowHeader = () => { - + {hasSubList && ( )} {!builtIn && ( - + , ]} > @@ -83,7 +83,7 @@ const UsedByModal = ({ id, isSpecificClient, onClose }: UsedByModalProps) => { loader={loader} isPaginated ariaLabelKey="usedBy" - searchPlaceholderKey="common:search" + searchPlaceholderKey="search" columns={[ { name: "name", diff --git a/js/apps/admin-ui/src/authentication/components/modals/AddStepModal.tsx b/js/apps/admin-ui/src/authentication/components/modals/AddStepModal.tsx index de4cc90160..9c29bbce1d 100644 --- a/js/apps/admin-ui/src/authentication/components/modals/AddStepModal.tsx +++ b/js/apps/admin-ui/src/authentication/components/modals/AddStepModal.tsx @@ -114,7 +114,7 @@ export const AddStepModal = ({ name, type, onSelect }: AddStepModalProps) => { key="add" onClick={() => onSelect(value)} > - {t("common:add")} + {t("add")} , , ]} > @@ -141,7 +141,7 @@ export const AddStepModal = ({ name, type, onSelect }: AddStepModalProps) => { setMax(max); }} inputGroupName="search" - inputGroupPlaceholder={t("common:search")} + inputGroupPlaceholder={t("search")} inputGroupOnEnter={setSearch} > - {t("common:add")} + {t("add")} , , ]} isOpen >
diff --git a/js/apps/admin-ui/src/authentication/form/NameDescription.tsx b/js/apps/admin-ui/src/authentication/form/NameDescription.tsx index 0dbe3e5834..fca22f320e 100644 --- a/js/apps/admin-ui/src/authentication/form/NameDescription.tsx +++ b/js/apps/admin-ui/src/authentication/form/NameDescription.tsx @@ -17,9 +17,9 @@ export const NameDescription = () => { return ( <> { /> { {...register("description", { maxLength: { value: 255, - message: t("common:maxLength", { length: 255 }), + message: t("maxLength", { length: 255 }), }, })} /> diff --git a/js/apps/admin-ui/src/authentication/policies/CibaPolicy.tsx b/js/apps/admin-ui/src/authentication/policies/CibaPolicy.tsx index f812006151..20efbc4543 100644 --- a/js/apps/admin-ui/src/authentication/policies/CibaPolicy.tsx +++ b/js/apps/admin-ui/src/authentication/policies/CibaPolicy.tsx @@ -154,23 +154,23 @@ export const CibaPolicy = ({ realm, realmUpdated }: CibaPolicyProps) => { {...register("attributes.cibaExpiresIn", { min: { value: CIBA_EXPIRES_IN_MIN, - message: t("common:greaterThan", { + message: t("greaterThan", { value: CIBA_EXPIRES_IN_MIN, }), }, max: { value: CIBA_EXPIRES_IN_MAX, - message: t("common:lessThan", { value: CIBA_EXPIRES_IN_MAX }), + message: t("lessThan", { value: CIBA_EXPIRES_IN_MAX }), }, required: { value: true, - message: t("common:required"), + message: t("required"), }, })} validated={errors.attributes?.cibaExpiresIn ? "error" : "default"} /> - {t("common:times:seconds")} + {t("times:seconds")} @@ -196,23 +196,23 @@ export const CibaPolicy = ({ realm, realmUpdated }: CibaPolicyProps) => { {...register("attributes.cibaInterval", { min: { value: CIBA_INTERVAL_MIN, - message: t("common:greaterThan", { + message: t("greaterThan", { value: CIBA_INTERVAL_MIN, }), }, max: { value: CIBA_INTERVAL_MAX, - message: t("common:lessThan", { value: CIBA_INTERVAL_MAX }), + message: t("lessThan", { value: CIBA_INTERVAL_MAX }), }, required: { value: true, - message: t("common:required"), + message: t("required"), }, })} validated={errors.attributes?.cibaInterval ? "error" : "default"} /> - {t("common:times:seconds")} + {t("times:seconds")} @@ -247,14 +247,14 @@ export const CibaPolicy = ({ realm, realmUpdated }: CibaPolicyProps) => { type="submit" isDisabled={!isValid || !isDirty} > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/authentication/policies/OtpPolicy.tsx b/js/apps/admin-ui/src/authentication/policies/OtpPolicy.tsx index 2835d744a8..e2ec871f6a 100644 --- a/js/apps/admin-ui/src/authentication/policies/OtpPolicy.tsx +++ b/js/apps/admin-ui/src/authentication/policies/OtpPolicy.tsx @@ -360,8 +360,8 @@ export const OtpPolicy = ({ realm, realmUpdated }: OtpPolicyProps) => { render={({ field }) => ( @@ -377,14 +377,14 @@ export const OtpPolicy = ({ realm, realmUpdated }: OtpPolicyProps) => { type="submit" isDisabled={!isValid || !isDirty} > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/authentication/policies/PasswordPolicy.tsx b/js/apps/admin-ui/src/authentication/policies/PasswordPolicy.tsx index 986eac43b0..926903a72d 100644 --- a/js/apps/admin-ui/src/authentication/policies/PasswordPolicy.tsx +++ b/js/apps/admin-ui/src/authentication/policies/PasswordPolicy.tsx @@ -164,14 +164,14 @@ export const PasswordPolicy = ({ type="submit" isDisabled={!isDirty} > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/authentication/policies/Policies.tsx b/js/apps/admin-ui/src/authentication/policies/Policies.tsx index 9ccd18603d..bdb1bf384b 100644 --- a/js/apps/admin-ui/src/authentication/policies/Policies.tsx +++ b/js/apps/admin-ui/src/authentication/policies/Policies.tsx @@ -22,7 +22,7 @@ export const Policies = () => { async () => { const realm = await adminClient.realms.findOne({ realm: realmName }); if (!realm) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } return realm; }, diff --git a/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx b/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx index 8cb931904d..d26302a99a 100644 --- a/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx +++ b/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx @@ -38,7 +38,7 @@ export const PolicyRow = ({ label={displayName} fieldId={id!} isRequired - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors[id!] ? ValidatedOptions.error : ValidatedOptions.default } @@ -93,8 +93,8 @@ export const PolicyRow = ({ {!configType && ( onRemove(id)} - aria-label={t("common:remove")} + aria-label={t("remove")} > diff --git a/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx b/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx index 62307e82b3..99174c8df4 100644 --- a/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx +++ b/js/apps/admin-ui/src/authentication/policies/WebauthnPolicy.tsx @@ -212,7 +212,7 @@ export const WebauthnPolicy = ({ ( - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/client-scopes/ClientScopesSection.tsx b/js/apps/admin-ui/src/client-scopes/ClientScopesSection.tsx index 97a4fd11df..31069d595b 100644 --- a/js/apps/admin-ui/src/client-scopes/ClientScopesSection.tsx +++ b/js/apps/admin-ui/src/client-scopes/ClientScopesSection.tsx @@ -154,7 +154,7 @@ export default function ClientScopesSection() { name: selectedScopes[0]?.name, }), messageKey: "deleteConfirmClientScopes", - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -258,7 +258,7 @@ export default function ClientScopesSection() { setKebabOpen(false); }} > - {t("common:delete")} + {t("delete")} , ]} /> @@ -267,7 +267,7 @@ export default function ClientScopesSection() { } actions={[ { - title: t("common:delete"), + title: t("delete"), onRowClick: (clientScope) => { setSelectedScopes([clientScope]); toggleDeleteDialog(); diff --git a/js/apps/admin-ui/src/client-scopes/CreateClientScope.tsx b/js/apps/admin-ui/src/client-scopes/CreateClientScope.tsx index b8466e319d..982cad98d4 100644 --- a/js/apps/admin-ui/src/client-scopes/CreateClientScope.tsx +++ b/js/apps/admin-ui/src/client-scopes/CreateClientScope.tsx @@ -34,7 +34,7 @@ export default function CreateClientScope() { }); if (!scope) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } await changeScope({ ...clientScope, id: scope.id }, clientScope.type); diff --git a/js/apps/admin-ui/src/client-scopes/EditClientScope.tsx b/js/apps/admin-ui/src/client-scopes/EditClientScope.tsx index b9ecc8fbfa..d0f88137e7 100644 --- a/js/apps/admin-ui/src/client-scopes/EditClientScope.tsx +++ b/js/apps/admin-ui/src/client-scopes/EditClientScope.tsx @@ -63,7 +63,7 @@ export default function EditClientScope() { const clientScope = await adminClient.clientScopes.findOne({ id }); if (!clientScope) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } return { @@ -132,7 +132,7 @@ export default function EditClientScope() { name: clientScope?.name, }), messageKey: "deleteConfirmClientScopes", - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -195,9 +195,9 @@ export default function EditClientScope() { mappers as ProtocolMapperRepresentation[], ); refresh(); - addAlert(t("common:mappingCreatedSuccess"), AlertVariant.success); + addAlert(t("mappingCreatedSuccess"), AlertVariant.success); } catch (error) { - addError("common:mappingCreatedError", error); + addError("mappingCreatedError", error); } } }; @@ -208,10 +208,10 @@ export default function EditClientScope() { id: clientScope!.id!, mapperId: mapper.id!, }); - addAlert(t("common:mappingDeletedSuccess"), AlertVariant.success); + addAlert(t("mappingDeletedSuccess"), AlertVariant.success); refresh(); } catch (error) { - addError("common:mappingDeletedError", error); + addError("mappingDeletedError", error); } return true; }; @@ -227,7 +227,7 @@ export default function EditClientScope() { titleKey={clientScope.name!} dropdownItems={[ - {t("common:delete")} + {t("delete")} , ]} badges={[{ text: clientScope.protocol }]} @@ -239,7 +239,7 @@ export default function EditClientScope() { {t("common:settings")}} + title={{t("settings")}} {...settingsTab} > @@ -249,7 +249,7 @@ export default function EditClientScope() { {t("common:mappers")}} + title={{t("mappers")}} {...mappersTab} > { const isBuiltIn = !!props.filter; - const header = [t("common:name"), t("common:description")]; + const header = [t("name"), t("description")]; return ( { props.toggleDialog(); }} > - {t("common:add")} + {t("add")} , , ] : [] @@ -188,20 +188,20 @@ export const AddMapperDialog = (props: AddMapperDialogProps) => { onSelect={setSelectedRows} canSelectAll ariaLabelKey="addPredefinedMappers" - searchPlaceholderKey="common:searchForMapper" + searchPlaceholderKey="searchForMapper" columns={[ { name: "id", - displayKey: "common:name", + displayKey: "name", }, { name: "description", - displayKey: "common:description", + displayKey: "description", }, ]} emptyState={ } diff --git a/js/apps/admin-ui/src/client-scopes/details/MapperList.tsx b/js/apps/admin-ui/src/client-scopes/details/MapperList.tsx index 500e75f027..9cf04cb05d 100644 --- a/js/apps/admin-ui/src/client-scopes/details/MapperList.tsx +++ b/js/apps/admin-ui/src/client-scopes/details/MapperList.tsx @@ -106,7 +106,7 @@ export const MapperList = ({ key={key} loader={loader} ariaLabelKey="clientScopeList" - searchPlaceholderKey="common:searchForMapper" + searchPlaceholderKey="searchForMapper" toolbarItem={ setMapperAction(false)} @@ -117,7 +117,7 @@ export const MapperList = ({ onToggle={() => setMapperAction(!mapperAction)} toggleIndicator={CaretDownIcon} > - {t("common:addMapper")} + {t("addMapper")} } isOpen={mapperAction} @@ -139,7 +139,7 @@ export const MapperList = ({ } actions={[ { - title: t("common:delete"), + title: t("delete"), onRowClick: onDelete, } as Action, ]} @@ -160,11 +160,11 @@ export const MapperList = ({ ]} emptyState={ toggleAddMapperDialog(true), }, { diff --git a/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx b/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx index 92a7969d64..abd07813a6 100644 --- a/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx +++ b/js/apps/admin-ui/src/client-scopes/details/MappingDetails.tsx @@ -78,7 +78,7 @@ export default function MappingDetails() { }); } if (!data) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } const mapperTypes = serverInfo.protocolMapperTypes![data!.protocol!]; @@ -99,7 +99,7 @@ export default function MappingDetails() { ? await adminClient.clientScopes.findOne({ id }) : await adminClient.clients.findOne({ id }); if (!model) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } const protocolMappers = serverInfo.protocolMapperTypes![model.protocol!]; @@ -107,7 +107,7 @@ export default function MappingDetails() { (mapper) => mapper.id === mapperId, ); if (!mapping) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } return { mapping, @@ -129,9 +129,9 @@ export default function MappingDetails() { ); const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({ - titleKey: "common:deleteMappingTitle", - messageKey: "common:deleteMappingConfirm", - continueButtonLabel: "common:delete", + titleKey: "deleteMappingTitle", + messageKey: "deleteMappingConfirm", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -146,10 +146,10 @@ export default function MappingDetails() { mapperId, }); } - addAlert(t("common:mappingDeletedSuccess"), AlertVariant.success); + addAlert(t("mappingDeletedSuccess"), AlertVariant.success); navigate(toDetails()); } catch (error) { - addError("common:mappingDeletedError", error); + addError("mappingDeletedError", error); } }, }); @@ -173,9 +173,9 @@ export default function MappingDetails() { ? await adminClient.clientScopes.addProtocolMapper({ id }, mapping) : await adminClient.clients.addProtocolMapper({ id }, mapping); } - addAlert(t(`common:mapping${key}Success`), AlertVariant.success); + addAlert(t(`mapping${key}Success`), AlertVariant.success); } catch (error) { - addError(`common:mapping${key}Error`, error); + addError(`mapping${key}Error`, error); } }; @@ -183,7 +183,7 @@ export default function MappingDetails() { <> - {t("common:delete")} + {t("delete")} , ] : undefined @@ -205,7 +205,7 @@ export default function MappingDetails() { onSubmit={handleSubmit(save)} role="manage-clients" > - + } @@ -224,7 +224,7 @@ export default function MappingDetails() { validated={ errors.name ? ValidatedOptions.error : ValidatedOptions.default } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} > diff --git a/js/apps/admin-ui/src/client-scopes/details/ScopeForm.tsx b/js/apps/admin-ui/src/client-scopes/details/ScopeForm.tsx index 59a76f66cf..05e7d19054 100644 --- a/js/apps/admin-ui/src/client-scopes/details/ScopeForm.tsx +++ b/js/apps/admin-ui/src/client-scopes/details/ScopeForm.tsx @@ -88,7 +88,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => { isHorizontal > } @@ -96,7 +96,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => { validated={ errors.name ? ValidatedOptions.error : ValidatedOptions.default } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} isRequired > { )} { validated={ errors.description ? ValidatedOptions.error : ValidatedOptions.default } - helperTextInvalid={t("common:maxLength", { length: 255 })} + helperTextInvalid={t("maxLength", { length: 255 })} > { render={({ field }) => ( field.onChange(value.toString())} /> @@ -302,8 +302,8 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => { render={({ field }) => ( field.onChange(value.toString())} /> @@ -340,7 +340,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => { type="submit" isDisabled={!isDirty || !isValid} > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/client-scopes/details/SearchFilter.tsx b/js/apps/admin-ui/src/client-scopes/details/SearchFilter.tsx index c1af44588b..787ed7924d 100644 --- a/js/apps/admin-ui/src/client-scopes/details/SearchFilter.tsx +++ b/js/apps/admin-ui/src/client-scopes/details/SearchFilter.tsx @@ -111,8 +111,8 @@ export const SearchToolbar = ({ isOpen={open} selections={[ type === AllClientScopes.none - ? t("common:allTypes") - : t(`common:clientScope.${type}`), + ? t("allTypes") + : t(`clientScopeTypes.${type}`), ]} onSelect={(_, value) => { onType(value as AllClientScopes); @@ -120,7 +120,7 @@ export const SearchToolbar = ({ }} > - {t("common:allTypes")} + {t("allTypes")} <>{clientScopeTypesSelectOptions(t)} diff --git a/js/apps/admin-ui/src/client-scopes/routes/Mapper.tsx b/js/apps/admin-ui/src/client-scopes/routes/Mapper.tsx index 430c1fb975..39a4c7b559 100644 --- a/js/apps/admin-ui/src/client-scopes/routes/Mapper.tsx +++ b/js/apps/admin-ui/src/client-scopes/routes/Mapper.tsx @@ -14,7 +14,7 @@ const MappingDetails = lazy(() => import("../details/MappingDetails")); export const MapperRoute: AppRouteObject = { path: "/:realm/client-scopes/:id/mappers/:mapperId", element: , - breadcrumb: (t) => t("common:mappingDetails"), + breadcrumb: (t) => t("mappingDetails"), handle: { access: "view-clients", }, diff --git a/js/apps/admin-ui/src/clients/ClientDescription.tsx b/js/apps/admin-ui/src/clients/ClientDescription.tsx index 454cfa25a1..4d08ac0a22 100644 --- a/js/apps/admin-ui/src/clients/ClientDescription.tsx +++ b/js/apps/admin-ui/src/clients/ClientDescription.tsx @@ -17,23 +17,23 @@ export const ClientDescription = ({ diff --git a/js/apps/admin-ui/src/clients/ClientDetails.tsx b/js/apps/admin-ui/src/clients/ClientDetails.tsx index 49c2579294..e758630cf3 100644 --- a/js/apps/admin-ui/src/clients/ClientDetails.tsx +++ b/js/apps/admin-ui/src/clients/ClientDetails.tsx @@ -96,7 +96,7 @@ const ClientDetailHeader = ({ const [toggleDisableDialog, DisableConfirm] = useConfirmDialog({ titleKey: "disableConfirmTitle", messageKey: "disableConfirm", - continueButtonLabel: "common:disable", + continueButtonLabel: "disable", onConfirm: () => { onChange(!value); save(); @@ -136,7 +136,7 @@ const ClientDetailHeader = ({ {t("downloadAdapterConfig")} , exportClient(client)}> - {t("common:export")} + {t("export")} , ...(!isRealmClient(client) && isManager ? [ @@ -146,7 +146,7 @@ const ClientDetailHeader = ({ key="delete" onClick={toggleDeleteDialog} > - {t("common:delete")} + {t("delete")} , ] : []), @@ -275,7 +275,7 @@ export default function ClientDetails() { const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({ titleKey: "clientDeleteConfirmTitle", messageKey: "clientDeleteConfirm", - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -306,7 +306,7 @@ export default function ClientDetails() { () => adminClient.clients.findOne({ id: clientId }), (fetchedClient) => { if (!fetchedClient) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } setClient(cloneDeep(fetchedClient)); setupForm(fetchedClient); @@ -372,8 +372,8 @@ export default function ClientDetails() { return ( <> {t("common:settings")}} + title={{t("settings")}} {...settingsTab} > {t("common:permissions")} - } + title={{t("permissions")}} {...authorizationPermissionsTab} > @@ -599,7 +597,7 @@ export default function ClientDetails() { {t("common:export")}} + title={{t("export")}} {...authorizationExportTab} > @@ -630,7 +628,7 @@ export default function ClientDetails() { {t("common:permissions")}} + title={{t("permissions")}} {...permissionsTab} > diff --git a/js/apps/admin-ui/src/clients/ClientsSection.tsx b/js/apps/admin-ui/src/clients/ClientsSection.tsx index 17f9dbdaac..180aaacccd 100644 --- a/js/apps/admin-ui/src/clients/ClientsSection.tsx +++ b/js/apps/admin-ui/src/clients/ClientsSection.tsx @@ -52,7 +52,7 @@ const ClientDetailLink = (client: ClientRepresentation) => { {client.clientId} {!client.enabled && ( - {t("common:disabled")} + {t("disabled")} )} @@ -147,7 +147,7 @@ export default function ClientsSection() { const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({ titleKey: t("clientDelete", { clientId: selectedClient?.clientId }), messageKey: "clientDeleteConfirm", - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -196,7 +196,7 @@ export default function ClientsSection() { const client: ClientRepresentation = rowData.data; const actions: Action[] = [ { - title: t("common:export"), + title: t("export"), onClick() { exportClient(client); }, @@ -208,7 +208,7 @@ export default function ClientsSection() { (isManager || client.access?.configure) ) { actions.push({ - title: t("common:delete"), + title: t("delete"), onClick() { setSelectedClient(client); toggleDeleteDialog(); @@ -221,26 +221,26 @@ export default function ClientsSection() { columns={[ { name: "clientId", - displayKey: "common:clientId", + displayKey: "clientId", transforms: [cellWidth(20)], cellRenderer: ClientDetailLink, }, { name: "clientName", - displayKey: "common:clientName", + displayKey: "clientName", transforms: [cellWidth(20)], cellRenderer: ClientName, }, { name: "protocol", - displayKey: "common:type", + displayKey: "type", transforms: [cellWidth(10)], cellRenderer: (client) => getProtocolName(t, client.protocol ?? "openid-connect"), }, { name: "description", - displayKey: "common:description", + displayKey: "description", transforms: [cellWidth(30)], cellRenderer: ClientDescription, }, diff --git a/js/apps/admin-ui/src/clients/add/CapabilityConfig.tsx b/js/apps/admin-ui/src/clients/add/CapabilityConfig.tsx index 522a64aa15..c91c512b03 100644 --- a/js/apps/admin-ui/src/clients/add/CapabilityConfig.tsx +++ b/js/apps/admin-ui/src/clients/add/CapabilityConfig.tsx @@ -59,8 +59,8 @@ export const CapabilityConfig = ({ { field.onChange(!value); @@ -99,8 +99,8 @@ export const CapabilityConfig = ({ { field.onChange(value); @@ -293,8 +293,8 @@ export const CapabilityConfig = ({ { field.onChange(value.toString()); setLoginThemeOpen(false); }} - selections={field.value || t("common:choose")} + selections={field.value || t("choose")} variant={SelectVariant.single} aria-label={t("loginTheme")} isOpen={loginThemeOpen} > {[ - {t("common:choose")} + {t("choose")} , ...loginThemes.map((theme) => ( { render={({ field }) => ( { render={({ field }) => ( field.onChange("" + value)} isDisabled={!consentRequired} diff --git a/js/apps/admin-ui/src/clients/add/LogoutPanel.tsx b/js/apps/admin-ui/src/clients/add/LogoutPanel.tsx index 4dc9cd5dfe..884992ef1a 100644 --- a/js/apps/admin-ui/src/clients/add/LogoutPanel.tsx +++ b/js/apps/admin-ui/src/clients/add/LogoutPanel.tsx @@ -60,8 +60,8 @@ export const LogoutPanel = ({ render={({ field }) => ( ( field.onChange(value.toString())} aria-label={t("backchannelLogoutSessionRequired")} @@ -198,8 +198,8 @@ export const LogoutPanel = ({ render={({ field }) => ( field.onChange(value.toString())} aria-label={t("backchannelLogoutRevokeOfflineSessions")} diff --git a/js/apps/admin-ui/src/clients/add/NewClientForm.tsx b/js/apps/admin-ui/src/clients/add/NewClientForm.tsx index e70a6a271e..25e40397f7 100644 --- a/js/apps/admin-ui/src/clients/add/NewClientForm.tsx +++ b/js/apps/admin-ui/src/clients/add/NewClientForm.tsx @@ -144,7 +144,7 @@ export default function NewClientForm() { forward(onNext); }} > - {isFinalStep() ? t("common:save") : t("common:next")} + {isFinalStep() ? t("save") : t("next")} )} diff --git a/js/apps/admin-ui/src/clients/add/SamlConfig.tsx b/js/apps/admin-ui/src/clients/add/SamlConfig.tsx index 891c9f0b48..7ef18d224c 100644 --- a/js/apps/admin-ui/src/clients/add/SamlConfig.tsx +++ b/js/apps/admin-ui/src/clients/add/SamlConfig.tsx @@ -42,8 +42,8 @@ export const Toggle = ({ name, label }: ToggleProps) => { field.onChange(value.toString())} aria-label={t(label)} diff --git a/js/apps/admin-ui/src/clients/advanced/AddHostDialog.tsx b/js/apps/admin-ui/src/clients/advanced/AddHostDialog.tsx index 974462076e..a164da1d7b 100644 --- a/js/apps/admin-ui/src/clients/advanced/AddHostDialog.tsx +++ b/js/apps/admin-ui/src/clients/advanced/AddHostDialog.tsx @@ -67,7 +67,7 @@ export const AddHostDialog = ({ form="add-host-form" isDisabled={!isDirty || !isValid} > - {t("common:save")} + {t("save")} , , ]} > diff --git a/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx b/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx index 19ac7e2889..541e3376ca 100644 --- a/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx +++ b/js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx @@ -160,8 +160,8 @@ export const AdvancedSettings = ({ render={({ field }) => ( field.onChange("" + value)} aria-label={t("oAuthMutual")} @@ -190,8 +190,8 @@ export const AdvancedSettings = ({ render={({ field }) => ( field.onChange("" + value)} aria-label={t("oAuthDPoP")} @@ -227,11 +227,11 @@ export const AdvancedSettings = ({ field.onChange(value); setOpen(false); }} - selections={[field.value || t("common:choose")]} + selections={[field.value || t("choose")]} > {["", "S256", "plain"].map((v) => ( - {v || t("common:choose")} + {v || t("choose")} ))} @@ -257,8 +257,8 @@ export const AdvancedSettings = ({ render={({ field }) => ( field.onChange(value.toString())} aria-label={t("pushedAuthorizationRequestRequired")} @@ -305,10 +305,10 @@ export const AdvancedSettings = ({ onClick={save} data-testid="OIDCAdvancedSave" > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/clients/advanced/AuthenticationOverrides.tsx b/js/apps/admin-ui/src/clients/advanced/AuthenticationOverrides.tsx index cb999df6e0..489e802d68 100644 --- a/js/apps/admin-ui/src/clients/advanced/AuthenticationOverrides.tsx +++ b/js/apps/admin-ui/src/clients/advanced/AuthenticationOverrides.tsx @@ -46,7 +46,7 @@ export const AuthenticationOverrides = ({ filteredFlows = sortBy(filteredFlows, [(f) => f.alias]); setFlows([ - {t("common:choose")} + {t("choose")} , ...filteredFlows.map((flow) => ( @@ -134,14 +134,14 @@ export const AuthenticationOverrides = ({ onClick={save} data-testid="OIDCAuthFlowOverrideSave" > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/clients/advanced/ClusteringPanel.tsx b/js/apps/admin-ui/src/clients/advanced/ClusteringPanel.tsx index fc864bde9d..ff7694157e 100644 --- a/js/apps/admin-ui/src/clients/advanced/ClusteringPanel.tsx +++ b/js/apps/admin-ui/src/clients/advanced/ClusteringPanel.tsx @@ -56,7 +56,7 @@ export const ClusteringPanel = ({ messageKey: t("deleteNodeBody", { node: selectedNode, }), - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -103,7 +103,7 @@ export const ClusteringPanel = ({ @@ -160,7 +160,7 @@ export const ClusteringPanel = ({ } actions={[ { - title: t("common:delete"), + title: t("delete"), onRowClick: (node) => { setSelectedNode(node.host); toggleDeleteNodeConfirm(); diff --git a/js/apps/admin-ui/src/clients/advanced/FineGrainOpenIdConnect.tsx b/js/apps/admin-ui/src/clients/advanced/FineGrainOpenIdConnect.tsx index e64ba18e8f..61a57bfdac 100644 --- a/js/apps/admin-ui/src/clients/advanced/FineGrainOpenIdConnect.tsx +++ b/js/apps/admin-ui/src/clients/advanced/FineGrainOpenIdConnect.tsx @@ -72,7 +72,7 @@ export const FineGrainOpenIdConnect = ({ const keyOptions = [ - {t("common:choose")} + {t("choose")} , ...sortProviders(clientSignatureProviders!).map((p) => ( @@ -80,7 +80,7 @@ export const FineGrainOpenIdConnect = ({ ]; const cekManagementOptions = [ - {t("common:choose")} + {t("choose")} , ...sortProviders(cekManagementProviders!).map((p) => ( @@ -96,7 +96,7 @@ export const FineGrainOpenIdConnect = ({ ]; const contentOptions = [ - {t("common:choose")} + {t("choose")} , ...sortProviders(contentEncryptionProviders!).map((p) => ( @@ -105,10 +105,10 @@ export const FineGrainOpenIdConnect = ({ const requestObjectOptions = [ - {t("common:any")} + {t("any")} , - {t("common:none")} + {t("none")} , ...sortProviders(clientSignatureProviders!).map((p) => ( @@ -117,7 +117,7 @@ export const FineGrainOpenIdConnect = ({ const requestObjectEncryptionOptions = [ - {t("common:any")} + {t("any")} , ...sortProviders(cekManagementProviders!).map((p) => ( @@ -126,7 +126,7 @@ export const FineGrainOpenIdConnect = ({ const requestObjectEncodingOptions = [ - {t("common:any")} + {t("any")} , ...sortProviders(contentEncryptionProviders!).map((p) => ( @@ -135,7 +135,7 @@ export const FineGrainOpenIdConnect = ({ const authorizationSignedResponseOptions = [ - {t("common:choose")} + {t("choose")} , ...sortProviders(signatureProviders!).map((p) => ( @@ -643,10 +643,10 @@ export const FineGrainOpenIdConnect = ({ diff --git a/js/apps/admin-ui/src/clients/advanced/FineGrainSamlEndpointConfig.tsx b/js/apps/admin-ui/src/clients/advanced/FineGrainSamlEndpointConfig.tsx index b79242a1b1..099e90eb28 100644 --- a/js/apps/admin-ui/src/clients/advanced/FineGrainSamlEndpointConfig.tsx +++ b/js/apps/admin-ui/src/clients/advanced/FineGrainSamlEndpointConfig.tsx @@ -69,10 +69,10 @@ export const FineGrainSamlEndpointConfig = ({ diff --git a/js/apps/admin-ui/src/clients/advanced/OpenIdConnectCompatibilityModes.tsx b/js/apps/admin-ui/src/clients/advanced/OpenIdConnectCompatibilityModes.tsx index d25760dbd1..0f7c5420ac 100644 --- a/js/apps/admin-ui/src/clients/advanced/OpenIdConnectCompatibilityModes.tsx +++ b/js/apps/admin-ui/src/clients/advanced/OpenIdConnectCompatibilityModes.tsx @@ -46,8 +46,8 @@ export const OpenIdConnectCompatibilityModes = ({ render={({ field }) => ( field.onChange(value.toString())} aria-label={t("excludeSessionStateFromAuthenticationResponse")} @@ -75,8 +75,8 @@ export const OpenIdConnectCompatibilityModes = ({ render={({ field }) => ( field.onChange(value.toString())} aria-label={t("excludeIssuerFromAuthenticationResponse")} @@ -104,8 +104,8 @@ export const OpenIdConnectCompatibilityModes = ({ render={({ field }) => ( field.onChange(value.toString())} aria-label={t("useRefreshTokens")} @@ -133,8 +133,8 @@ export const OpenIdConnectCompatibilityModes = ({ render={({ field }) => ( field.onChange(value.toString())} aria-label={t("useRefreshTokenForClientCredentialsGrant")} @@ -162,8 +162,8 @@ export const OpenIdConnectCompatibilityModes = ({ render={({ field }) => ( field.onChange(value.toString())} aria-label={t("useLowerCaseBearerType")} @@ -177,14 +177,14 @@ export const OpenIdConnectCompatibilityModes = ({ onClick={save} data-testid="OIDCCompatabilitySave" > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/clients/advanced/RevocationPanel.tsx b/js/apps/admin-ui/src/clients/advanced/RevocationPanel.tsx index dc23358c4b..3e359d93fc 100644 --- a/js/apps/admin-ui/src/clients/advanced/RevocationPanel.tsx +++ b/js/apps/admin-ui/src/clients/advanced/RevocationPanel.tsx @@ -49,7 +49,7 @@ export const RevocationPanel = ({ if (date > 0) { return formatDate(new Date(date * 1000), FORMAT_DATE_AND_TIME); } else { - return t("common:none"); + return t("none"); } }; diff --git a/js/apps/admin-ui/src/clients/authorization/AuthorizationDataModal.tsx b/js/apps/admin-ui/src/clients/authorization/AuthorizationDataModal.tsx index cd112cc718..59897bebe3 100644 --- a/js/apps/admin-ui/src/clients/authorization/AuthorizationDataModal.tsx +++ b/js/apps/admin-ui/src/clients/authorization/AuthorizationDataModal.tsx @@ -50,7 +50,7 @@ export const AuthorizationDataModal = ({ key="cancel" onClick={toggle} > - {t("common:cancel")} + {t("cancel")} , ]} > diff --git a/js/apps/admin-ui/src/clients/authorization/AuthorizationEvaluate.tsx b/js/apps/admin-ui/src/clients/authorization/AuthorizationEvaluate.tsx index 546ca41f40..767a99001b 100644 --- a/js/apps/admin-ui/src/clients/authorization/AuthorizationEvaluate.tsx +++ b/js/apps/admin-ui/src/clients/authorization/AuthorizationEvaluate.tsx @@ -228,7 +228,7 @@ const AuthorizationEvaluateContent = ({ client }: Props) => { } fieldId="realmRole" validated={errors.roleIds ? "error" : "default"} - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} isRequired={user.length === 0} > { > { } fieldId="client" validated={errors.alias ? "error" : "default"} - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} > { fieldLabelId={`contextualAttributes`} /> } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} fieldId="contextualAttributes" > { variant="link" onClick={() => reset()} > - {t("common:revert")} + {t("revert")} diff --git a/js/apps/admin-ui/src/clients/authorization/AuthorizationExport.tsx b/js/apps/admin-ui/src/clients/authorization/AuthorizationExport.tsx index b58b4983c4..0792a0bd1a 100644 --- a/js/apps/admin-ui/src/clients/authorization/AuthorizationExport.tsx +++ b/js/apps/admin-ui/src/clients/authorization/AuthorizationExport.tsx @@ -88,7 +88,7 @@ export const AuthorizationExport = () => { data-testid="authorization-export-download" onClick={() => exportAuthDetails()} > - {t("common:download")} + {t("download")} , ]} > @@ -118,8 +118,8 @@ export const ImportDialog = ({ onConfirm, closeDialog }: ImportDialogProps) => { > toggleValueSelect(rowIndex, open)} isOpen={isValueOpenArray[rowIndex]} @@ -138,7 +138,7 @@ const ValueInput = ({ className="value-input" defaultValue={attribute.value} data-testid="attribute-value-input" - aria-label={t("common:value")} + aria-label={t("value")} {...register(`${name}.${rowIndex}.value`)} /> )} @@ -236,7 +236,7 @@ export const KeyBasedAttributeInput = ({ variant="link" className="kc-attributes__minus-icon" onClick={() => remove(rowIndex)} - aria-label={t("common:remove")} + aria-label={t("remove")} > diff --git a/js/apps/admin-ui/src/clients/authorization/MoreLabel.tsx b/js/apps/admin-ui/src/clients/authorization/MoreLabel.tsx index ef30cd039d..41723af8eb 100644 --- a/js/apps/admin-ui/src/clients/authorization/MoreLabel.tsx +++ b/js/apps/admin-ui/src/clients/authorization/MoreLabel.tsx @@ -11,7 +11,5 @@ export const MoreLabel = ({ array }: MoreLabelProps) => { if (!array || array.length <= 1) { return null; } - return ( - - ); + return ; }; diff --git a/js/apps/admin-ui/src/clients/authorization/NewPolicyDialog.tsx b/js/apps/admin-ui/src/clients/authorization/NewPolicyDialog.tsx index c3e0ec4f71..18ade59c5b 100644 --- a/js/apps/admin-ui/src/clients/authorization/NewPolicyDialog.tsx +++ b/js/apps/admin-ui/src/clients/authorization/NewPolicyDialog.tsx @@ -56,8 +56,8 @@ export const NewPolicyDialog = ({ - {t("common:name")} - {t("common:description")} + {t("name")} + {t("description")} diff --git a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx index f6b1d29706..f581a0a05e 100644 --- a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx +++ b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx @@ -91,7 +91,7 @@ export default function PermissionDetails() { ]); if (!permission) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } return { @@ -194,7 +194,7 @@ export default function PermissionDetails() { data-testid="delete-resource" onClick={() => toggleDeleteDialog()} > - {t("common:delete")} + {t("delete")} , ] : undefined @@ -208,9 +208,9 @@ export default function PermissionDetails() { > @@ -259,8 +259,8 @@ export default function PermissionDetails() { } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={errors.resources ? "error" : "default"} isRequired={permissionType !== "scope"} > @@ -325,7 +325,7 @@ export default function PermissionDetails() { fieldLabelId="scopesSelect" /> } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={errors.scopes ? "error" : "default"} isRequired > @@ -393,7 +393,7 @@ export default function PermissionDetails() { type="submit" data-testid="save" > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/clients/authorization/Permissions.tsx b/js/apps/admin-ui/src/clients/authorization/Permissions.tsx index fa479c3a0c..d52cef3451 100644 --- a/js/apps/admin-ui/src/clients/authorization/Permissions.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Permissions.tsx @@ -267,10 +267,10 @@ export const AuthorizationPermissions = ({ clientId }: PermissionsProps) => { - {t("common:name")} - {t("common:type")} + {t("name")} + {t("type")} {t("associatedPolicy")} - {t("common:description")} + {t("description")} @@ -317,7 +317,7 @@ export const AuthorizationPermissions = ({ clientId }: PermissionsProps) => { actions={{ items: [ { - title: t("common:delete"), + title: t("delete"), onClick: async () => { setSelectedPermission(permission); toggleDeleteDialog(); @@ -373,8 +373,8 @@ export const AuthorizationPermissions = ({ clientId }: PermissionsProps) => { {noData && searching && ( )} diff --git a/js/apps/admin-ui/src/clients/authorization/Policies.tsx b/js/apps/admin-ui/src/clients/authorization/Policies.tsx index e3c4f0ca49..8900709b0f 100644 --- a/js/apps/admin-ui/src/clients/authorization/Policies.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Policies.tsx @@ -213,10 +213,10 @@ export const AuthorizationPolicies = ({ clientId }: PoliciesProps) => { - {t("common:name")} - {t("common:type")} + {t("name")} + {t("type")} {t("dependentPermission")} - {t("common:description")} + {t("description")} @@ -258,7 +258,7 @@ export const AuthorizationPolicies = ({ clientId }: PoliciesProps) => { actions={{ items: [ { - title: t("common:delete"), + title: t("delete"), onClick: async () => { setSelectedPolicy(policy); toggleDeleteDialog(); @@ -308,8 +308,8 @@ export const AuthorizationPolicies = ({ clientId }: PoliciesProps) => { {noData && searching && ( )} {noData && !searching && ( diff --git a/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx b/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx index 272ac047d3..59bb9ed1a3 100644 --- a/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx +++ b/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx @@ -85,7 +85,7 @@ export default function ResourceDetails() { ]), ([client, resource, permissions]) => { if (!client) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } setClient(client); setPermission(permissions); @@ -176,7 +176,7 @@ export default function ResourceDetails() { data-testid="delete-resource" onClick={() => toggleDeleteDialog()} > - {t("common:delete")} + {t("delete")} , ] : undefined @@ -204,12 +204,12 @@ export default function ResourceDetails() { /> } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors.name ? ValidatedOptions.error : ValidatedOptions.default } @@ -292,8 +292,8 @@ export default function ResourceDetails() { render={({ field }) => ( - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/clients/authorization/Resources.tsx b/js/apps/admin-ui/src/clients/authorization/Resources.tsx index f5640129f3..082eb00148 100644 --- a/js/apps/admin-ui/src/clients/authorization/Resources.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Resources.tsx @@ -186,9 +186,9 @@ export const AuthorizationResources = ({ clientId }: ResourcesProps) => { - {t("common:name")} + {t("name")} {t("displayName")} - {t("common:type")} + {t("type")} {t("owner")} {t("uris")} @@ -254,7 +254,7 @@ export const AuthorizationResources = ({ clientId }: ResourcesProps) => { actions={{ items: [ { - title: t("common:delete"), + title: t("delete"), onClick: async () => { setSelectedResource(resource); setPermission( @@ -293,8 +293,8 @@ export const AuthorizationResources = ({ clientId }: ResourcesProps) => { {noData && searching && ( )} {noData && !searching && ( diff --git a/js/apps/admin-ui/src/clients/authorization/ResourcesPolicySelect.tsx b/js/apps/admin-ui/src/clients/authorization/ResourcesPolicySelect.tsx index 116b32900e..f3fcaf496b 100644 --- a/js/apps/admin-ui/src/clients/authorization/ResourcesPolicySelect.tsx +++ b/js/apps/admin-ui/src/clients/authorization/ResourcesPolicySelect.tsx @@ -147,7 +147,7 @@ export const ResourcesPolicySelect = ({ const [toggleUnsavedChangesDialog, UnsavedChangesConfirm] = useConfirmDialog({ titleKey: t("unsavedChangesTitle"), messageKey: t("unsavedChangesConfirm"), - continueButtonLabel: t("common:continue"), + continueButtonLabel: t("continue"), continueButtonVariant: ButtonVariant.danger, onConfirm: () => onUnsavedChangesConfirm?.(), }); diff --git a/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx b/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx index 5f9bb0b141..e6cbb04633 100644 --- a/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx +++ b/js/apps/admin-ui/src/clients/authorization/ScopeDetails.tsx @@ -55,7 +55,7 @@ export default function ScopeDetails() { scopeId, }); if (!scope) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } return scope; } @@ -116,7 +116,7 @@ export default function ScopeDetails() { data-testid="delete-resource" onClick={() => toggleDeleteDialog()} > - {t("common:delete")} + {t("delete")} , ] : undefined @@ -129,12 +129,12 @@ export default function ScopeDetails() { onSubmit={handleSubmit(onSubmit)} > } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors.name ? ValidatedOptions.error : ValidatedOptions.default } @@ -177,7 +177,7 @@ export default function ScopeDetails() { type="submit" data-testid="save" > - {t("common:save")} + {t("save")} {!scope ? ( @@ -195,7 +195,7 @@ export default function ScopeDetails() { > )} > - {t("common:cancel")} + {t("cancel")} ) : ( )} diff --git a/js/apps/admin-ui/src/clients/authorization/ScopePicker.tsx b/js/apps/admin-ui/src/clients/authorization/ScopePicker.tsx index bc46a5ba46..b63babee45 100644 --- a/js/apps/admin-ui/src/clients/authorization/ScopePicker.tsx +++ b/js/apps/admin-ui/src/clients/authorization/ScopePicker.tsx @@ -66,8 +66,8 @@ export const ScopePicker = ({ clientId }: { clientId: string }) => { variant={SelectVariant.typeaheadMulti} chipGroupProps={{ numChips: 3, - expandedText: t("common:hide"), - collapsedText: t("common:showRemaining"), + expandedText: t("hide"), + collapsedText: t("showRemaining"), }} onToggle={setOpen} isOpen={open} diff --git a/js/apps/admin-ui/src/clients/authorization/Scopes.tsx b/js/apps/admin-ui/src/clients/authorization/Scopes.tsx index b46caca73e..eb9f939226 100644 --- a/js/apps/admin-ui/src/clients/authorization/Scopes.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Scopes.tsx @@ -184,7 +184,7 @@ export const AuthorizationScopes = ({ clientId }: ScopesProps) => { - {t("common:name")} + {t("name")} {t("displayName")} @@ -241,7 +241,7 @@ export const AuthorizationScopes = ({ clientId }: ScopesProps) => { actions={{ items: [ { - title: t("common:delete"), + title: t("delete"), onClick: () => { setSelectedScope(scope); toggleDeleteDialog(); @@ -312,8 +312,8 @@ export const AuthorizationScopes = ({ clientId }: ScopesProps) => { {noData && searching && ( )} diff --git a/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx b/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx index 2fae8572d2..5c6febc5bb 100644 --- a/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx +++ b/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx @@ -94,7 +94,7 @@ export const SearchDropdown = ({ className="keycloak__client_authentication__searchdropdown_form" onSubmit={handleSubmit(submit)} > - + {isResource && ( <> - + {!isResource && ( - + {typeOptions(field.value)} @@ -175,14 +175,14 @@ export const SearchDropdown = ({ data-testid="search-btn" isDisabled={!isDirty} > - {t("common:search")} + {t("search")} diff --git a/js/apps/admin-ui/src/clients/authorization/Settings.tsx b/js/apps/admin-ui/src/clients/authorization/Settings.tsx index 9ce879d869..79c9dedefc 100644 --- a/js/apps/admin-ui/src/clients/authorization/Settings.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Settings.tsx @@ -160,8 +160,8 @@ export const AuthorizationSettings = ({ clientId }: { clientId: string }) => { render={({ field }) => ( { name={"inputGroupName"} id={"inputGroupName"} type="search" - aria-label={t("common:search")} - placeholder={t("common:search")} + aria-label={t("search")} + placeholder={t("search")} onChange={setSearchInput} onKeyDown={handleKeyDown} /> {" "} diff --git a/js/apps/admin-ui/src/clients/authorization/policy/Regex.tsx b/js/apps/admin-ui/src/clients/authorization/policy/Regex.tsx index 5e5ab726f8..2aedf72d2a 100644 --- a/js/apps/admin-ui/src/clients/authorization/policy/Regex.tsx +++ b/js/apps/admin-ui/src/clients/authorization/policy/Regex.tsx @@ -17,7 +17,7 @@ export const Regex = () => { { } isRequired validated={errors.pattern ? "error" : "default"} - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} > { - {t("common:to")} + {t("to")} @@ -208,7 +208,7 @@ export const Time = () => { } isRequired - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors.notBefore ? ValidatedOptions.error : ValidatedOptions.default } @@ -222,7 +222,7 @@ export const Time = () => { } isRequired - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors.notOnOrAfter ? ValidatedOptions.error diff --git a/js/apps/admin-ui/src/clients/credentials/ClientSecret.tsx b/js/apps/admin-ui/src/clients/credentials/ClientSecret.tsx index 71d35c8e4d..1d3b8ed1f3 100644 --- a/js/apps/admin-ui/src/clients/credentials/ClientSecret.tsx +++ b/js/apps/admin-ui/src/clients/credentials/ClientSecret.tsx @@ -101,7 +101,7 @@ export const ClientSecret = ({ client, secret, toggle }: ClientSecretProps) => { const [toggleInvalidateConfirm, InvalidateConfirm] = useConfirmDialog({ titleKey: "invalidateRotatedSecret", messageKey: "invalidateRotatedSecretExplain", - continueButtonLabel: "common:confirm", + continueButtonLabel: "confirm", onConfirm: async () => { try { await adminClient.clients.invalidateSecret({ diff --git a/js/apps/admin-ui/src/clients/credentials/Credentials.tsx b/js/apps/admin-ui/src/clients/credentials/Credentials.tsx index cbefe43a7b..e2213be7f2 100644 --- a/js/apps/admin-ui/src/clients/credentials/Credentials.tsx +++ b/js/apps/admin-ui/src/clients/credentials/Credentials.tsx @@ -108,8 +108,8 @@ export const Credentials = ({ client, save, refresh }: CredentialsProps) => { const [toggleClientSecretConfirm, ClientSecretConfirm] = useConfirmDialog({ titleKey: "confirmClientSecretTitle", messageKey: "confirmClientSecretBody", - continueButtonLabel: "common:yes", - cancelButtonLabel: "common:no", + continueButtonLabel: "yes", + cancelButtonLabel: "no", onConfirm: regenerateClientSecret, }); @@ -125,8 +125,8 @@ export const Credentials = ({ client, save, refresh }: CredentialsProps) => { const [toggleAccessTokenConfirm, AccessTokenConfirm] = useConfirmDialog({ titleKey: "confirmAccessTokenTitle", messageKey: "confirmAccessTokenBody", - continueButtonLabel: "common:yes", - cancelButtonLabel: "common:no", + continueButtonLabel: "yes", + cancelButtonLabel: "no", onConfirm: regenerateAccessToken, }); @@ -196,7 +196,7 @@ export const Credentials = ({ client, save, refresh }: CredentialsProps) => { {clientAuthenticatorType === "client-x509" && } diff --git a/js/apps/admin-ui/src/clients/credentials/X509.tsx b/js/apps/admin-ui/src/clients/credentials/X509.tsx index c2cb5fbb6a..917898ccb4 100644 --- a/js/apps/admin-ui/src/clients/credentials/X509.tsx +++ b/js/apps/admin-ui/src/clients/credentials/X509.tsx @@ -35,8 +35,8 @@ export const X509 = () => { render={({ field }) => ( field.onChange(value.toString())} aria-label={t("allowRegexComparison")} @@ -50,7 +50,7 @@ export const X509 = () => { labelIcon={ } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors.attributes?.[beerify("x509.subjectdn")] ? ValidatedOptions.error diff --git a/js/apps/admin-ui/src/clients/import/ImportForm.tsx b/js/apps/admin-ui/src/clients/import/ImportForm.tsx index 04403b9942..6d555ebe21 100644 --- a/js/apps/admin-ui/src/clients/import/ImportForm.tsx +++ b/js/apps/admin-ui/src/clients/import/ImportForm.tsx @@ -111,11 +111,11 @@ export default function ImportForm() { id="realm-file" language={Language.json} extension=".json,.xml" - helpText={t("common-help:helpFileUploadClient")} + helpText={t("helpFileUploadClient")} onChange={handleFileChange} /> - + diff --git a/js/apps/admin-ui/src/clients/initial-access/CreateInitialAccessToken.tsx b/js/apps/admin-ui/src/clients/initial-access/CreateInitialAccessToken.tsx index f8f2cb9b83..662eb866fd 100644 --- a/js/apps/admin-ui/src/clients/initial-access/CreateInitialAccessToken.tsx +++ b/js/apps/admin-ui/src/clients/initial-access/CreateInitialAccessToken.tsx @@ -132,7 +132,7 @@ export default function CreateInitialAccessToken() { data-testid="save" isDisabled={!isValid} > - {t("common:save")} + {t("save")} diff --git a/js/apps/admin-ui/src/clients/initial-access/InitialAccessTokenList.tsx b/js/apps/admin-ui/src/clients/initial-access/InitialAccessTokenList.tsx index 8736e782ee..b73b146c92 100644 --- a/js/apps/admin-ui/src/clients/initial-access/InitialAccessTokenList.tsx +++ b/js/apps/admin-ui/src/clients/initial-access/InitialAccessTokenList.tsx @@ -39,7 +39,7 @@ export const InitialAccessTokenList = () => { const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({ titleKey: "tokenDeleteConfirmTitle", messageKey: t("tokenDeleteConfirm", { id: token?.id }), - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -69,12 +69,12 @@ export const InitialAccessTokenList = () => { )} > - {t("common:create")} + {t("create")} } actions={[ { - title: t("common:delete"), + title: t("delete"), onRowClick: (token) => { setToken(token); toggleDeleteDialog(); @@ -84,7 +84,7 @@ export const InitialAccessTokenList = () => { columns={[ { name: "id", - displayKey: "common:id", + displayKey: "id", }, { name: "timestamp", @@ -115,7 +115,7 @@ export const InitialAccessTokenList = () => { navigate(toCreateInitialAccessToken({ realm })) } diff --git a/js/apps/admin-ui/src/clients/keys/ExportSamlKeyDialog.tsx b/js/apps/admin-ui/src/clients/keys/ExportSamlKeyDialog.tsx index a138279aa5..ef1f342316 100644 --- a/js/apps/admin-ui/src/clients/keys/ExportSamlKeyDialog.tsx +++ b/js/apps/admin-ui/src/clients/keys/ExportSamlKeyDialog.tsx @@ -61,7 +61,7 @@ export const ExportSamlKeyDialog = ({ type="submit" form="export-saml-key-form" > - {t("common:export")} + {t("export")} , , ]} > diff --git a/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx b/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx index 86e7445852..f24fc0cc55 100644 --- a/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx +++ b/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx @@ -195,7 +195,7 @@ export const GenerateKeyDialog = ({ toggleDialog(); }} > - {t("common:cancel")} + {t("cancel")} , ]} > diff --git a/js/apps/admin-ui/src/clients/keys/ImportKeyDialog.tsx b/js/apps/admin-ui/src/clients/keys/ImportKeyDialog.tsx index b2fb26b9f1..8da99c977e 100644 --- a/js/apps/admin-ui/src/clients/keys/ImportKeyDialog.tsx +++ b/js/apps/admin-ui/src/clients/keys/ImportKeyDialog.tsx @@ -84,7 +84,7 @@ export const ImportKeyDialog = ({ toggleDialog(); }} > - {t("common:cancel")} + {t("cancel")} , ]} > diff --git a/js/apps/admin-ui/src/clients/keys/Keys.tsx b/js/apps/admin-ui/src/clients/keys/Keys.tsx index 271957f0bf..10dfa4f8f3 100644 --- a/js/apps/admin-ui/src/clients/keys/Keys.tsx +++ b/js/apps/admin-ui/src/clients/keys/Keys.tsx @@ -156,8 +156,8 @@ export const Keys = ({ clientId, save, hasConfigureAccess }: KeysProps) => { field.onChange(`${value}`)} aria-label={t("useJwksUrl")} @@ -197,7 +197,7 @@ export const Keys = ({ clientId, save, hasConfigureAccess }: KeysProps) => { onClick={save} isDisabled={!isDirty} > - {t("common:save")} + {t("save")} @@ -207,8 +207,8 @@ export const SamlKeys = ({ clientId, save }: SamlKeysProps) => { messageKey: t("disableSigningExplain", { key: t(key), }), - continueButtonLabel: "common:yes", - cancelButtonLabel: "common:no", + continueButtonLabel: "yes", + cancelButtonLabel: "no", onConfirm: () => { setValue(KEYS_MAPPING[selectedType!].name, "false"); save(); @@ -218,8 +218,8 @@ export const SamlKeys = ({ clientId, save }: SamlKeysProps) => { const [toggleReGenerateDialog, ReGenerateConfirm] = useConfirmDialog({ titleKey: "reGenerateSigning", messageKey: "reGenerateSigningExplain", - continueButtonLabel: "common:yes", - cancelButtonLabel: "common:no", + continueButtonLabel: "yes", + cancelButtonLabel: "no", onConfirm: () => { generate(selectedType!); }, diff --git a/js/apps/admin-ui/src/clients/keys/SamlKeysDialog.tsx b/js/apps/admin-ui/src/clients/keys/SamlKeysDialog.tsx index 48de9db316..d4e4ad9841 100644 --- a/js/apps/admin-ui/src/clients/keys/SamlKeysDialog.tsx +++ b/js/apps/admin-ui/src/clients/keys/SamlKeysDialog.tsx @@ -146,7 +146,7 @@ export const SamlKeysDialog = ({ variant={ButtonVariant.link} onClick={onCancel} > - {t("common:cancel")} + {t("cancel")} , ]} > diff --git a/js/apps/admin-ui/src/clients/keys/StoreSettings.tsx b/js/apps/admin-ui/src/clients/keys/StoreSettings.tsx index 3844b8020c..e24db09ef3 100644 --- a/js/apps/admin-ui/src/clients/keys/StoreSettings.tsx +++ b/js/apps/admin-ui/src/clients/keys/StoreSettings.tsx @@ -29,7 +29,7 @@ export const StoreSettings = ({ labelIcon={ } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={errors.keyAlias ? "error" : "default"} > } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={errors.keyPassword ? "error" : "default"} > } - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={errors.storePassword ? "error" : "default"} > ( - - {name} - - ), - )} + dataListCells={[t("name"), t("description")].map((name) => ( + + {name} + + ))} /> diff --git a/js/apps/admin-ui/src/clients/registration/ClientRegistrationList.tsx b/js/apps/admin-ui/src/clients/registration/ClientRegistrationList.tsx index b59d24b9b5..bc194606b7 100644 --- a/js/apps/admin-ui/src/clients/registration/ClientRegistrationList.tsx +++ b/js/apps/admin-ui/src/clients/registration/ClientRegistrationList.tsx @@ -69,7 +69,7 @@ export const ClientRegistrationList = ({ messageKey: t("clientRegisterPolicyDeleteConfirm", { name: selectedPolicy?.name, }), - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -115,7 +115,7 @@ export const ClientRegistrationList = ({ } actions={[ { - title: t("common:delete"), + title: t("delete"), onRowClick: (policy) => { setSelectedPolicy(policy); toggleDeleteDialog(); @@ -125,7 +125,7 @@ export const ClientRegistrationList = ({ columns={[ { name: "name", - displayKey: "common:name", + displayKey: "name", cellRenderer: DetailLink, }, { diff --git a/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx b/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx index 0ec45ce5c1..ccc20205e1 100644 --- a/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx +++ b/js/apps/admin-ui/src/clients/registration/DetailProvider.tsx @@ -101,7 +101,7 @@ export default function DetailProvider() { messageKey: t("clientRegisterPolicyDeleteConfirm", { name: providerName, }), - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -134,7 +134,7 @@ export default function DetailProvider() { key="delete" onClick={toggleDeleteDialog} > - {t("common:delete")} + {t("delete")} , ] : undefined @@ -156,9 +156,9 @@ export default function DetailProvider() { /> diff --git a/js/apps/admin-ui/src/clients/routes/Mapper.tsx b/js/apps/admin-ui/src/clients/routes/Mapper.tsx index 85554f669f..b361c82a3c 100644 --- a/js/apps/admin-ui/src/clients/routes/Mapper.tsx +++ b/js/apps/admin-ui/src/clients/routes/Mapper.tsx @@ -16,7 +16,7 @@ const MappingDetails = lazy( export const MapperRoute: AppRouteObject = { path: "/:realm/clients/:id/clientScopes/dedicated/mappers/:mapperId", element: , - breadcrumb: (t) => t("common:mappingDetails"), + breadcrumb: (t) => t("mappingDetails"), handle: { access: "view-clients", }, diff --git a/js/apps/admin-ui/src/clients/scopes/AddScopeDialog.tsx b/js/apps/admin-ui/src/clients/scopes/AddScopeDialog.tsx index 2d131785fc..32bf0357f0 100644 --- a/js/apps/admin-ui/src/clients/scopes/AddScopeDialog.tsx +++ b/js/apps/admin-ui/src/clients/scopes/AddScopeDialog.tsx @@ -151,7 +151,7 @@ export const AddScopeDialog = ({ }} isDisabled={rows.length === 0} > - {t("common:add")} + {t("add")} , , ] : [ @@ -181,7 +181,7 @@ export const AddScopeDialog = ({ toggleIndicator={CaretUpIcon} id="add-scope-toggle" > - {t("common:add")} + {t("add")} } dropdownItems={clientScopeTypesDropdown(t, action)} @@ -195,7 +195,7 @@ export const AddScopeDialog = ({ toggleDialog(); }} > - {t("common:cancel")} + {t("cancel")} , ] } @@ -229,9 +229,7 @@ export const AddScopeDialog = ({ data-testid="filter-type-dropdown-item" key="filter-type" > - {filterType === FilterType.Name - ? t("protocol") - : t("common:name")} + {filterType === FilterType.Name ? t("protocol") : t("name")} , ]} /> @@ -260,14 +258,14 @@ export const AddScopeDialog = ({ data-testid="filter-type-dropdown-item" key="filter-type" > - {t("common:name")} + {t("name")} , ]} /> )} diff --git a/js/apps/admin-ui/src/user/EditUser.tsx b/js/apps/admin-ui/src/user/EditUser.tsx index 51aa074e45..b0d2b8d376 100644 --- a/js/apps/admin-ui/src/user/EditUser.tsx +++ b/js/apps/admin-ui/src/user/EditUser.tsx @@ -95,7 +95,7 @@ export default function EditUser() { ]); if (!user || !currentRealm || !attackDetection) { - throw new Error(t("common:notFound")); + throw new Error(t("notFound")); } const isBruteForceProtected = currentRealm.bruteForceProtected; @@ -140,7 +140,7 @@ export default function EditUser() { const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({ titleKey: "users:deleteConfirm", messageKey: "users:deleteConfirmCurrentUser", - continueButtonLabel: "common:delete", + continueButtonLabel: "delete", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { @@ -199,7 +199,7 @@ export default function EditUser() { isDisabled={!user.access?.manage} onClick={() => toggleDeleteDialog()} > - {t("common:delete")} + {t("delete")} , ]} onToggle={(value) => @@ -218,7 +218,7 @@ export default function EditUser() { > {t("common:details")}} + title={{t("details")}} {...settingsTab} > @@ -233,7 +233,7 @@ export default function EditUser() { {!isUserProfileEnabled && ( {t("common:attributes")}} + title={{t("attributes")}} {...attributesTab} > @@ -242,7 +242,7 @@ export default function EditUser() { {t("common:credentials")}} + title={{t("credentials")}} {...credentialsTab} > @@ -258,7 +258,7 @@ export default function EditUser() { {hasAccess("query-groups") && ( {t("common:groups")}} + title={{t("groups")}} {...groupsTab} > diff --git a/js/apps/admin-ui/src/user/UserConsents.tsx b/js/apps/admin-ui/src/user/UserConsents.tsx index 7242983042..807e38c54e 100644 --- a/js/apps/admin-ui/src/user/UserConsents.tsx +++ b/js/apps/admin-ui/src/user/UserConsents.tsx @@ -63,7 +63,7 @@ export const UserConsents = () => { messageKey: t("users:revokeClientScopes", { clientId: selectedClient?.clientId, }), - continueButtonLabel: "common:revoke", + continueButtonLabel: "revoke", continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { diff --git a/js/apps/admin-ui/src/user/UserCredentials.tsx b/js/apps/admin-ui/src/user/UserCredentials.tsx index 0995fee502..0db3cc859d 100644 --- a/js/apps/admin-ui/src/user/UserCredentials.tsx +++ b/js/apps/admin-ui/src/user/UserCredentials.tsx @@ -124,7 +124,7 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => { const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({ titleKey: t("deleteCredentialsConfirmTitle"), messageKey: t("deleteCredentialsConfirm"), - continueButtonLabel: t("common:delete"), + continueButtonLabel: t("delete"), continueButtonVariant: ButtonVariant.danger, onConfirm: async () => { try { diff --git a/js/apps/admin-ui/src/user/UserForm.tsx b/js/apps/admin-ui/src/user/UserForm.tsx index cbea7a1d26..7e7a403282 100644 --- a/js/apps/admin-ui/src/user/UserForm.tsx +++ b/js/apps/admin-ui/src/user/UserForm.tsx @@ -52,7 +52,7 @@ const EmailVerified = () => { { id="kc-user-email-verified" onChange={(value) => field.onChange(value)} isChecked={field.value} - label={t("common:yes")} - labelOff={t("common:no")} + label={t("yes")} + labelOff={t("no")} /> )} /> @@ -185,7 +185,7 @@ export const UserForm = ({ {isUserProfileEnabled && } {user?.id && ( <> - + )} {!user?.id && ( } @@ -365,7 +365,7 @@ export const UserForm = ({ variant="primary" type="submit" > - {user?.id ? t("common:save") : t("common:create")} + {user?.id ? t("save") : t("create")} diff --git a/js/apps/admin-ui/src/user/UserGroups.tsx b/js/apps/admin-ui/src/user/UserGroups.tsx index e938967142..48480c1657 100644 --- a/js/apps/admin-ui/src/user/UserGroups.tsx +++ b/js/apps/admin-ui/src/user/UserGroups.tsx @@ -169,7 +169,7 @@ export const UserGroups = ({ user }: UserGroupsProps) => { className="keycloak_user-section_groups-table" isPaginated ariaLabelKey="roles:roleList" - searchPlaceholderKey="groups:searchGroup" + searchPlaceholderKey="searchGroup" canSelectAll onSelect={(groups) => isDirectMembership diff --git a/js/apps/admin-ui/src/user/UserIdPModal.tsx b/js/apps/admin-ui/src/user/UserIdPModal.tsx index 8a082e150c..a6d751c4f4 100644 --- a/js/apps/admin-ui/src/user/UserIdPModal.tsx +++ b/js/apps/admin-ui/src/user/UserIdPModal.tsx @@ -81,7 +81,7 @@ export const UserIdpModal = ({ variant={ButtonVariant.link} onClick={onClose} > - {t("common:cancel")} + {t("cancel")} , ]} isOpen @@ -102,7 +102,7 @@ export const UserIdpModal = ({ label={t("users:userID")} fieldId="userID" helperText={t("users-help:userIdHelperText")} - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors.userId ? ValidatedOptions.error : ValidatedOptions.default } @@ -122,7 +122,7 @@ export const UserIdpModal = ({ label={t("users:username")} fieldId="username" helperText={t("users-help:usernameHelperText")} - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} validated={ errors.userName ? ValidatedOptions.error : ValidatedOptions.default } diff --git a/js/apps/admin-ui/src/user/UserIdentityProviderLinks.tsx b/js/apps/admin-ui/src/user/UserIdentityProviderLinks.tsx index 0b93c83120..5b3dcc28af 100644 --- a/js/apps/admin-ui/src/user/UserIdentityProviderLinks.tsx +++ b/js/apps/admin-ui/src/user/UserIdentityProviderLinks.tsx @@ -100,7 +100,7 @@ export const UserIdentityProviderLinks = ({ addAlert(t("users:idpUnlinkSuccess"), AlertVariant.success); refresh(); } catch (error) { - addError("common:mappingDeletedError", error); + addError("mappingDeletedError", error); } }, }); @@ -203,14 +203,14 @@ export const UserIdentityProviderLinks = ({ columns={[ { name: "identityProvider", - displayKey: "common:name", + displayKey: "name", cellFormatters: [emptyFormatter()], cellRenderer: idpLinkRenderer, transforms: [cellWidth(20)], }, { name: "type", - displayKey: "common:type", + displayKey: "type", cellFormatters: [emptyFormatter()], cellRenderer: badgeRenderer1, transforms: [cellWidth(10)], @@ -256,13 +256,13 @@ export const UserIdentityProviderLinks = ({ columns={[ { name: "alias", - displayKey: "common:name", + displayKey: "name", cellFormatters: [emptyFormatter(), upperCaseFormatter()], transforms: [cellWidth(20)], }, { name: "type", - displayKey: "common:type", + displayKey: "type", cellFormatters: [emptyFormatter()], cellRenderer: badgeRenderer2, transforms: [cellWidth(60)], diff --git a/js/apps/admin-ui/src/user/UsersSection.tsx b/js/apps/admin-ui/src/user/UsersSection.tsx index fa4befd2e4..5d518985cd 100644 --- a/js/apps/admin-ui/src/user/UsersSection.tsx +++ b/js/apps/admin-ui/src/user/UsersSection.tsx @@ -64,7 +64,7 @@ export default function UsersSection() { {t("common:permissions")}} + title={{t("permissions")}} {...permissionsTab} > diff --git a/js/apps/admin-ui/src/user/components/SelectComponent.tsx b/js/apps/admin-ui/src/user/components/SelectComponent.tsx index 478bece2f9..b4d57564b2 100644 --- a/js/apps/admin-ui/src/user/components/SelectComponent.tsx +++ b/js/apps/admin-ui/src/user/components/SelectComponent.tsx @@ -69,14 +69,10 @@ export const SelectComponent = (attribute: UserProfileFieldsProps) => { } }} selections={ - field.value - ? field.value - : isMultiValue(field) - ? [] - : t("common:choose") + field.value ? field.value : isMultiValue(field) ? [] : t("choose") } variant={isMultiValue(field) ? "typeaheadmulti" : "single"} - aria-label={t("common:selectOne")} + aria-label={t("selectOne")} isOpen={open} readOnly={attribute.readOnly} > diff --git a/js/apps/admin-ui/src/user/components/UserProfileGroup.tsx b/js/apps/admin-ui/src/user/components/UserProfileGroup.tsx index b75d0e6569..94eb17aac1 100644 --- a/js/apps/admin-ui/src/user/components/UserProfileGroup.tsx +++ b/js/apps/admin-ui/src/user/components/UserProfileGroup.tsx @@ -40,7 +40,7 @@ export const UserProfileGroup = ({ fieldId={attribute.name} isRequired={isRequired(attribute)} validated={errors.username ? "error" : "default"} - helperTextInvalid={t("common:required")} + helperTextInvalid={t("required")} labelIcon={ helpText ? ( diff --git a/js/apps/admin-ui/src/user/user-credentials/ResetPasswordDialog.tsx b/js/apps/admin-ui/src/user/user-credentials/ResetPasswordDialog.tsx index 68a52a3830..380f969c90 100644 --- a/js/apps/admin-ui/src/user/user-credentials/ResetPasswordDialog.tsx +++ b/js/apps/admin-ui/src/user/user-credentials/ResetPasswordDialog.tsx @@ -139,7 +139,7 @@ export const ResetPasswordDialog = ({ toggleDialog={toggle} onConfirm={toggleConfirmSaveModal} confirmButtonDisabled={!isValid} - continueButtonLabel="common:save" + continueButtonLabel="save" >
} @@ -220,9 +220,9 @@ export const ResetPasswordDialog = ({ className="kc-temporaryPassword" onChange={field.onChange} isChecked={field.value} - label={t("common:on")} - labelOff={t("common:off")} - aria-label={t("common:temporaryPassword")} + label={t("on")} + labelOff={t("off")} + aria-label={t("temporaryPassword")} /> )} />