From bd80f208fa968dffb16c9c410dbfb002354b52da Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Thu, 2 Nov 2023 17:03:47 +0100
Subject: [PATCH] Remove leftover namespaces from translation keys (#24486)

---
 js/apps/admin-ui/cypress/e2e/i18n_test.spec.ts             | 1 -
 .../admin-ui/src/authentication/EmptyExecutionState.tsx    | 2 +-
 js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx | 2 +-
 js/apps/admin-ui/src/clients/add/SamlConfig.tsx            | 7 +------
 js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx    | 4 +---
 .../src/clients/authorization/PermissionDetails.tsx        | 2 +-
 js/apps/admin-ui/src/clients/authorization/policy/Time.tsx | 7 +------
 js/apps/admin-ui/src/clients/credentials/Credentials.tsx   | 2 +-
 js/apps/admin-ui/src/clients/keys/Certificate.tsx          | 7 +------
 js/apps/admin-ui/src/clients/keys/SamlKeys.tsx             | 5 +----
 js/apps/admin-ui/src/clients/scopes/ClientScopes.tsx       | 2 +-
 .../admin-ui/src/components/group/GroupPickerDialog.tsx    | 2 +-
 js/apps/admin-ui/src/components/users/UserSelect.tsx       | 4 +---
 js/apps/admin-ui/src/events/EventsSection.tsx              | 6 +++---
 js/apps/admin-ui/src/realm-settings/DefaultGroupsTab.tsx   | 2 +-
 js/apps/admin-ui/src/realm-settings/GeneralTab.tsx         | 2 +-
 .../src/realm-settings/NewClientPolicyCondition.tsx        | 4 +---
 .../src/realm-settings/event-config/EventConfigForm.tsx    | 2 +-
 .../admin-ui/src/realm-settings/event-config/EventsTab.tsx | 2 +-
 .../admin-ui/src/realm-settings/security-defences/Time.tsx | 7 +------
 js/apps/admin-ui/src/realm/routes/AddRealm.tsx             | 2 +-
 21 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/js/apps/admin-ui/cypress/e2e/i18n_test.spec.ts b/js/apps/admin-ui/cypress/e2e/i18n_test.spec.ts
index c464d90e011..9d07d96d3bc 100644
--- a/js/apps/admin-ui/cypress/e2e/i18n_test.spec.ts
+++ b/js/apps/admin-ui/cypress/e2e/i18n_test.spec.ts
@@ -134,7 +134,6 @@ describe("i18n tests", () => {
 
     goToUserFederationPage();
 
-    // check key "user-federation:addProvider_other"
     providersPage.assertCardContainsText("ldap", "Add Ldap providers");
   });
 
diff --git a/js/apps/admin-ui/src/authentication/EmptyExecutionState.tsx b/js/apps/admin-ui/src/authentication/EmptyExecutionState.tsx
index dc529f3fa33..1bfe9c5ae96 100644
--- a/js/apps/admin-ui/src/authentication/EmptyExecutionState.tsx
+++ b/js/apps/admin-ui/src/authentication/EmptyExecutionState.tsx
@@ -69,7 +69,7 @@ export const EmptyExecutionState = ({
               <Title headingLevel="h2" size={TitleSizes.md}>
                 {t(`${section}Title`)}
               </Title>
-              <p>{t(`authentication-help:${section}`)}</p>
+              <p>{t(section)}</p>
             </FlexItem>
             <Flex alignSelf={{ default: "alignSelfCenter" }}>
               <FlexItem>
diff --git a/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx b/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx
index 2b429d46fca..fc0d31520b6 100644
--- a/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx
+++ b/js/apps/admin-ui/src/authentication/policies/PolicyRow.tsx
@@ -45,7 +45,7 @@ export const PolicyRow = ({
       labelIcon={
         <HelpItem
           helpText={t(`passwordPoliciesHelp.${id}`)}
-          fieldLabelId={`authentication:${id}`}
+          fieldLabelId={id!}
         />
       }
     >
diff --git a/js/apps/admin-ui/src/clients/add/SamlConfig.tsx b/js/apps/admin-ui/src/clients/add/SamlConfig.tsx
index 415297082aa..a1fb1c3a31d 100644
--- a/js/apps/admin-ui/src/clients/add/SamlConfig.tsx
+++ b/js/apps/admin-ui/src/clients/add/SamlConfig.tsx
@@ -27,12 +27,7 @@ export const Toggle = ({ name, label }: ToggleProps) => {
       hasNoPaddingTop
       label={t(label)}
       fieldId={label}
-      labelIcon={
-        <HelpItem
-          helpText={t(`${label}Help`)}
-          fieldLabelId={`clients:${label}`}
-        />
-      }
+      labelIcon={<HelpItem helpText={t(`${label}Help`)} fieldLabelId={label} />}
     >
       <Controller
         name={name}
diff --git a/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx b/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
index 3995f2d9824..49aa616b75f 100644
--- a/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
+++ b/js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
@@ -49,9 +49,7 @@ export const TokenLifespan = ({
     <FormGroup
       label={t(id)}
       fieldId={id}
-      labelIcon={
-        <HelpItem helpText={t(`${id}Help`)} fieldLabelId={`clients:${id}`} />
-      }
+      labelIcon={<HelpItem helpText={t(`${id}Help`)} fieldLabelId={id} />}
     >
       <Controller
         name={name}
diff --git a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
index de299650d52..81eef52220e 100644
--- a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
@@ -184,7 +184,7 @@ export default function PermissionDetails() {
         titleKey={
           permissionId
             ? permission.name!
-            : `clients:create${toUpperCase(permissionType)}BasedPermission`
+            : `create${toUpperCase(permissionType)}BasedPermission`
         }
         dropdownItems={
           permissionId
diff --git a/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx b/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx
index 9823fd38966..1e19ed75229 100644
--- a/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/policy/Time.tsx
@@ -132,12 +132,7 @@ const FromTo = ({ name, ...rest }: NumberControlProps) => {
     <FormGroup
       label={t(name)}
       fieldId={name}
-      labelIcon={
-        <HelpItem
-          helpText={t(`${name}Help`)}
-          fieldLabelId={`clients:${name}`}
-        />
-      }
+      labelIcon={<HelpItem helpText={t(`${name}Help`)} fieldLabelId={name} />}
     >
       <Split hasGutter>
         <SplitItem>
diff --git a/js/apps/admin-ui/src/clients/credentials/Credentials.tsx b/js/apps/admin-ui/src/clients/credentials/Credentials.tsx
index a77f968fa28..34f5b8c9cb7 100644
--- a/js/apps/admin-ui/src/clients/credentials/Credentials.tsx
+++ b/js/apps/admin-ui/src/clients/credentials/Credentials.tsx
@@ -91,7 +91,7 @@ export const Credentials = ({ client, save, refresh }: CredentialsProps) => {
       addAlert(t(`${message}Success`), AlertVariant.success);
       return data;
     } catch (error) {
-      addError(`clients:${message}Error`, error);
+      addError(`${message}Error`, error);
     }
   }
 
diff --git a/js/apps/admin-ui/src/clients/keys/Certificate.tsx b/js/apps/admin-ui/src/clients/keys/Certificate.tsx
index cbfd4592824..c9a29e8cc51 100644
--- a/js/apps/admin-ui/src/clients/keys/Certificate.tsx
+++ b/js/apps/admin-ui/src/clients/keys/Certificate.tsx
@@ -39,12 +39,7 @@ export const Certificate = ({ keyInfo, plain = false }: CertificateProps) => {
     <FormGroup
       label={t("certificate")}
       fieldId={id}
-      labelIcon={
-        <HelpItem
-          helpText={t("certificateHelp")}
-          fieldLabelId={`clients:${id}`}
-        />
-      }
+      labelIcon={<HelpItem helpText={t("certificateHelp")} fieldLabelId={id} />}
     >
       <CertificateDisplay id={id} keyInfo={keyInfo} />
     </FormGroup>
diff --git a/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx b/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx
index ee11479598b..1244ee2fcee 100644
--- a/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx
+++ b/js/apps/admin-ui/src/clients/keys/SamlKeys.tsx
@@ -95,10 +95,7 @@ const KeySection = ({
         <FormAccess role="manage-clients" isHorizontal>
           <FormGroup
             labelIcon={
-              <HelpItem
-                helpText={t(`${key}Help`)}
-                fieldLabelId={`clients:${key}`}
-              />
+              <HelpItem helpText={t(`${key}Help`)} fieldLabelId={key} />
             }
             label={t(key)}
             fieldId={key}
diff --git a/js/apps/admin-ui/src/clients/scopes/ClientScopes.tsx b/js/apps/admin-ui/src/clients/scopes/ClientScopes.tsx
index 18f980632e3..b4c69a885a7 100644
--- a/js/apps/admin-ui/src/clients/scopes/ClientScopes.tsx
+++ b/js/apps/admin-ui/src/clients/scopes/ClientScopes.tsx
@@ -241,7 +241,7 @@ export const ClientScopes = ({
       <KeycloakDataTable
         key={key}
         loader={loader}
-        ariaLabelKey={`clients:clientScopeList-${key}`}
+        ariaLabelKey={`clientScopeList-${key}`}
         searchPlaceholderKey={
           searchType === "name" ? "searchByName" : undefined
         }
diff --git a/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx b/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
index 514ae40b5bc..b46916915a1 100644
--- a/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
+++ b/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
@@ -90,7 +90,7 @@ export const GroupPickerDialog = ({
         if (!navigation.map(({ id }) => id).includes(groupId)) {
           group = await adminClient.groups.findOne({ id: groupId });
           if (!group) {
-            throw new Error(t("common:notFound"));
+            throw new Error(t("notFound"));
           }
         }
         if (group?.id) {
diff --git a/js/apps/admin-ui/src/components/users/UserSelect.tsx b/js/apps/admin-ui/src/components/users/UserSelect.tsx
index 63154fae16e..dd03ea72a33 100644
--- a/js/apps/admin-ui/src/components/users/UserSelect.tsx
+++ b/js/apps/admin-ui/src/components/users/UserSelect.tsx
@@ -81,9 +81,7 @@ export const UserSelect = ({
     <FormGroup
       label={t(label!)}
       isRequired={isRequired}
-      labelIcon={
-        <HelpItem helpText={helpText!} fieldLabelId={`clients:${label}`} />
-      }
+      labelIcon={<HelpItem helpText={helpText!} fieldLabelId={label!} />}
       fieldId={name!}
       validated={errors[name!] ? "error" : "default"}
       helperTextInvalid={t("required")}
diff --git a/js/apps/admin-ui/src/events/EventsSection.tsx b/js/apps/admin-ui/src/events/EventsSection.tsx
index ea2f19bbbd9..ac32d5a8ed6 100644
--- a/js/apps/admin-ui/src/events/EventsSection.tsx
+++ b/js/apps/admin-ui/src/events/EventsSection.tsx
@@ -312,7 +312,7 @@ export default function EventsSection() {
                                 );
                               }}
                             >
-                              {t(`realm-settings:eventTypes.${chip}.name`)}
+                              {t(`eventTypes.${chip}.name`)}
                             </Chip>
                           ))}
                         </ChipGroup>
@@ -320,7 +320,7 @@ export default function EventsSection() {
                     >
                       {events?.enabledEventTypes?.map((option) => (
                         <SelectOption key={option} value={option}>
-                          {t(`realm-settings:eventTypes.${option}.name`)}
+                          {t(`eventTypes.${option}.name`)}
                         </SelectOption>
                       ))}
                     </Select>
@@ -437,7 +437,7 @@ export default function EventsSection() {
                           key={entry}
                           onClick={() => removeFilterValue(key, entry)}
                         >
-                          {t(`realm-settings:eventTypes.${entry}.name`)}
+                          {t(`eventTypes.${entry}.name`)}
                         </Chip>
                       ))
                     )}
diff --git a/js/apps/admin-ui/src/realm-settings/DefaultGroupsTab.tsx b/js/apps/admin-ui/src/realm-settings/DefaultGroupsTab.tsx
index 5abd2b6c2c8..000f1d0e5b6 100644
--- a/js/apps/admin-ui/src/realm-settings/DefaultGroupsTab.tsx
+++ b/js/apps/admin-ui/src/realm-settings/DefaultGroupsTab.tsx
@@ -132,7 +132,7 @@ export const DefaultsGroupsTab = () => {
       {enabled && (
         <Popover
           bodyContent={
-            <Trans i18nKey="realm-settings-help:defaultGroups">
+            <Trans i18nKey="defaultGroups">
               {" "}
               <Link to={toUserFederation({ realm })} />.
             </Trans>
diff --git a/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx b/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx
index 05edcaf8fbd..689a8fd10b2 100644
--- a/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx
+++ b/js/apps/admin-ui/src/realm-settings/GeneralTab.tsx
@@ -94,7 +94,7 @@ export const RealmSettingsGeneralTab = ({
               required: { value: true, message: t("required") },
               pattern: {
                 value: /^[a-zA-Z0-9-_]+$/,
-                message: t("realm:invalidRealmName"),
+                message: t("invalidRealmName"),
               },
             }}
             defaultValue=""
diff --git a/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx b/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx
index d2dbe21d140..78a4636b990 100644
--- a/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx
+++ b/js/apps/admin-ui/src/realm-settings/NewClientPolicyCondition.tsx
@@ -229,9 +229,7 @@ export default function NewClientPolicyCondition() {
                     <SelectOption
                       selected={condition.id === field.value}
                       description={t(
-                        `realm-settings-help:${camelCase(
-                          condition.id.replace(/-/g, " "),
-                        )}`,
+                        camelCase(condition.id.replace(/-/g, " ")),
                       )}
                       key={condition.id}
                       value={condition}
diff --git a/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx b/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx
index f662a7a9561..4aee77516f2 100644
--- a/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx
+++ b/js/apps/admin-ui/src/realm-settings/event-config/EventConfigForm.tsx
@@ -161,7 +161,7 @@ export const EventConfigForm = ({
         labelIcon={
           <HelpItem
             helpText={t(`${type}-clearEventsHelp`)}
-            fieldLabelId={`realm-settings:clear-${type}-events`}
+            fieldLabelId={`clear-${type}-events`}
           />
         }
       >
diff --git a/js/apps/admin-ui/src/realm-settings/event-config/EventsTab.tsx b/js/apps/admin-ui/src/realm-settings/event-config/EventsTab.tsx
index bb37e6e50c7..c146c4fa021 100644
--- a/js/apps/admin-ui/src/realm-settings/event-config/EventsTab.tsx
+++ b/js/apps/admin-ui/src/realm-settings/event-config/EventsTab.tsx
@@ -78,7 +78,7 @@ export const EventsTab = ({ realm }: EventsTabProps) => {
         }
         addAlert(t(`${type}-events-cleared`), AlertVariant.success);
       } catch (error) {
-        addError(`realm-settings:${type}-events-cleared-error`, error);
+        addError(`${type}-events-cleared-error`, error);
       }
     },
   });
diff --git a/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx b/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx
index be9e50282da..49b4467f677 100644
--- a/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx
+++ b/js/apps/admin-ui/src/realm-settings/security-defences/Time.tsx
@@ -23,12 +23,7 @@ export const Time = ({
       style={style}
       label={t(name)}
       fieldId={name}
-      labelIcon={
-        <HelpItem
-          helpText={t(`${name}Help`)}
-          fieldLabelId={`realm-settings:${name}`}
-        />
-      }
+      labelIcon={<HelpItem helpText={t(`${name}Help`)} fieldLabelId={name} />}
       validated={
         errors[name] ? ValidatedOptions.error : ValidatedOptions.default
       }
diff --git a/js/apps/admin-ui/src/realm/routes/AddRealm.tsx b/js/apps/admin-ui/src/realm/routes/AddRealm.tsx
index 9655d4a1e9c..6c3fe30c5f1 100644
--- a/js/apps/admin-ui/src/realm/routes/AddRealm.tsx
+++ b/js/apps/admin-ui/src/realm/routes/AddRealm.tsx
@@ -10,7 +10,7 @@ const NewRealmForm = lazy(() => import("../add/NewRealmForm"));
 export const AddRealmRoute: AppRouteObject = {
   path: "/:realm/add-realm",
   element: <NewRealmForm />,
-  breadcrumb: (t) => t("realm:createRealm"),
+  breadcrumb: (t) => t("createRealm"),
   handle: {
     access: "view-realm",
   },