refactor: consolidate English translations (#6640)

packages/forms-collection/src/icon-picker/icon-picker.spec.ts

@@ -43,7 +43,7 @@ vi.mock("@homarr/auth/client", () => ({
 }));
 vi.mock("@homarr/translation", () => ({ supportedLanguages: [] }));
 vi.mock("@homarr/translation/client", () => ({
-  useScopedI18n: () => (key: string, params?: Record<string, string>) =>
+  useI18n: () => (key: string, params?: Record<string, string>) =>
     params ? `${key}:${Object.values(params).join(",")}` : key,
 }));
 vi.mock("../upload-media/upload-media", () => ({

packages/forms-collection/src/icon-picker/icon-picker.tsx

@@ -35,7 +35,7 @@ import {
 import { clientApi } from "@homarr/api/client";
 import { useSession } from "@homarr/auth/client";
 import { supportedLanguages } from "@homarr/translation";
-import { useScopedI18n } from "@homarr/translation/client";
+import { useI18n } from "@homarr/translation/client";
 
 import { UploadMedia } from "../upload-media/upload-media";
 import { arrangeIconPickerSections, isDirectImageUrl, isImageSource, isSvgImage } from "./icon-picker.utils";
@@ -72,7 +72,7 @@ export const IconPicker = ({
   const [keyboardIndex, setKeyboardIndex] = useState(-1);
   const [previewState, setPreviewState] = useState<PreviewState>("idle");
   const { data: session } = useSession();
-  const tCommon = useScopedI18n("common");
+  const tCommon = useI18n("common");
   const [debouncedDraft] = useDebouncedValue(draft, 250);
 
   const directUrl = isDirectImageUrl(draft) ? draft.trim() : null;

packages/forms-collection/src/new-app/_app-new-form.tsx

@@ -7,7 +7,7 @@ import type { z } from "zod/v4";
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n, useScopedI18n } from "@homarr/translation/client";
+import { useI18n } from "@homarr/translation/client";
 import type { appManageSchema } from "@homarr/validation/app";
 
 import { AppForm } from "./_form";
@@ -19,14 +19,14 @@ export const AppNewForm = ({
   showCreateAnother: boolean;
   showBackToOverview: boolean;
 }) => {
-  const tScoped = useScopedI18n("app.page.create.notification");
-  const t = useI18n();
+  const tScoped = useI18n("app.page.create.notification");
+  const tCommon = useI18n("common");
   const router = useRouter();
 
   const { mutate, isPending } = clientApi.app.create.useMutation({
     onError: () => {
       showErrorNotification({
-        title: tScoped("error.title"),
+        title: tCommon("notification.create.error"),
         message: tScoped("error.message"),
       });
     },
@@ -37,7 +37,7 @@ export const AppNewForm = ({
       mutate(values, {
         onSuccess() {
           showSuccessNotification({
-            title: tScoped("success.title"),
+            title: tCommon("notification.create.success"),
             message: tScoped("success.message"),
           });
           afterSuccess?.();
@@ -51,14 +51,14 @@ export const AppNewForm = ({
         },
       });
     },
-    [mutate, router, tScoped],
+    [mutate, router, tCommon, tScoped],
   );
 
   return (
     <AppForm
       buttonLabels={{
-        submit: t("common.action.create"),
-        submitAndCreateAnother: showCreateAnother ? t("common.action.createAnother") : undefined,
+        submit: tCommon("action.create"),
+        submitAndCreateAnother: showCreateAnother ? tCommon("action.createAnother") : undefined,
       }}
       showBackToOverview={showBackToOverview}
       handleSubmit={handleSubmit}

packages/forms-collection/src/new-app/_form.tsx

@@ -7,6 +7,7 @@ import { useDisclosure } from "@mantine/hooks";
 import type { z } from "zod/v4";
 
 import { useZodForm } from "@homarr/form";
+import { invariantTechnicalLabels } from "@homarr/definitions";
 import { useI18n } from "@homarr/translation/client";
 import { Link } from "@homarr/ui";
 import { appManageSchema } from "@homarr/validation/app";
@@ -50,7 +51,8 @@ export const AppForm = ({
   hideButtons,
   formRef,
 }: AppFormProps) => {
-  const t = useI18n();
+  const tApp = useI18n("app");
+  const tCommon = useI18n("common");
 
   const form = useZodForm(appManageSchema, {
     initialValues: toFormValues(initialValues),
@@ -127,25 +129,25 @@ export const AppForm = ({
 
   const formFields = (
     <Stack>
-      <TextInput {...form.getInputProps("name")} withAsterisk label={t("app.field.name.label")} />
+      <TextInput {...form.getInputProps("name")} withAsterisk label={tCommon("field.name")} />
       <IconPicker
         {...form.getInputProps("iconUrl")}
         suggestedSearch={initialValues === undefined ? form.values.name : undefined}
       />
       <Textarea
         {...form.getInputProps("description")}
-        label={t("app.field.description.label")}
+        label={tApp("field.description.label")}
         autosize
         minRows={2}
         resize="vertical"
       />
-      <TextInput {...form.getInputProps("href")} label={t("app.field.url.label")} />
+      <TextInput {...form.getInputProps("href")} label={invariantTechnicalLabels.url} />
 
       <Checkbox
         checked={opened}
         onChange={handleClickDifferentUrlPing}
-        label={t("app.field.useDifferentUrlForPing.checkbox.label")}
-        description={t("app.field.useDifferentUrlForPing.checkbox.description")}
+        label={tApp("field.useDifferentUrlForPing.checkbox.label")}
+        description={tApp("field.useDifferentUrlForPing.checkbox.description")}
         mt="md"
       />
 
@@ -157,7 +159,7 @@ export const AppForm = ({
         <Group justify="end">
           {showBackToOverview && (
             <Button variant="default" component={Link} href="/manage/apps">
-              {t("common.action.backToOverview")}
+              {tCommon("action.backToOverview")}
             </Button>
           )}
           {buttonLabels.submitAndCreateAnother && (

packages/forms-collection/src/user-create/user-create-password-fields.tsx

@@ -3,7 +3,7 @@
 import { PasswordInput, Stack } from "@mantine/core";
 import type { PasswordInputProps } from "@mantine/core";
 
-import { useScopedI18n } from "@homarr/translation/client";
+import { useI18n } from "@homarr/translation/client";
 import { CustomPasswordInput } from "@homarr/ui";
 
 interface UserCreatePasswordFieldsProps {
@@ -17,7 +17,7 @@ export const UserCreatePasswordFields = ({
   confirmPasswordInputProps,
   variant,
 }: UserCreatePasswordFieldsProps) => {
-  const t = useScopedI18n("user.field");
+  const t = useI18n("user.field");
 
   return (
     <Stack gap="md">