@carlonicora/nextjs-jsonapi 1.29.2 → 1.29.3

package/src/components/navigations/RecentPagesNavigator.tsx

@@ -28,11 +28,11 @@ export function RecentPagesNavigator() {
     <DropdownMenu>
       <DropdownMenuTrigger>
         <div className="flex w-full cursor-pointer items-center gap-2">
-          {state === "collapsed" ? <HistoryIcon className="h-4 w-4" /> : <span>{t(`generic.recent_pages`)}</span>}
+          {state === "collapsed" ? <HistoryIcon className="h-4 w-4" /> : <span>{t(`common.recent_pages`)}</span>}
         </div>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="start" className="w-96">
-        <DropdownMenuLabel>{t(`generic.recent_pages`)}</DropdownMenuLabel>
+        <DropdownMenuLabel>{t(`common.recent_pages`)}</DropdownMenuLabel>
         <DropdownMenuSeparator />
         {recentPages.map((page, index) => (
           <DropdownMenuItem key={`${page.url}-${index}`}>
@@ -40,7 +40,7 @@ export function RecentPagesNavigator() {
               <div className="flex flex-col">
                 <div className="truncate text-sm">{page.title}</div>
                 <div className="text-muted-foreground text-xs font-normal">
-                  {t(`types.${page.moduleType}`, { count: 1 })}
+                  {t(`entities.${page.moduleType}`, { count: 1 })}
                 </div>
               </div>
             </Link>

package/src/components/tables/ContentTableSearch.tsx

@@ -84,7 +84,7 @@ export function ContentTableSearch({ data }: ContentTableSearchProps) {
           }}
           onFocus={() => setIsFocused(true)}
           onBlur={handleBlur}
-          placeholder={t(`generic.search.placeholder_global`)}
+          placeholder={t(`ui.search.placeholder_global`)}
           type="text"
           className="border-border/50 focus-visible:border-border h-10 w-full pr-8 pl-8 text-xs shadow-none focus-visible:ring-0"
           onChange={(e) => setSearchTerm(e.target.value)}

package/src/contexts/CommonContext.tsx

@@ -3,8 +3,8 @@
 import { useTranslations } from "next-intl";
 
 import { createContext, ReactNode, useContext } from "react";
-import { UserInterface } from "../features/user/data";
 import { useCurrentUserContext } from "../features/user/contexts";
+import { UserInterface } from "../features/user/data";
 import { BreadcrumbItemData } from "../interfaces";
 import { SharedProvider } from "./SharedContext";
 
@@ -28,7 +28,7 @@ export const CommonProvider = ({ children }: CommonProviderProps) => {
 
   const title = () => {
     const response: any = {
-      type: t(`generic.title`),
+      type: t(`common.title`),
     };
 
     if (company) response.element = company.name;

package/src/features/auth/components/details/LandingComponent.tsx

@@ -2,9 +2,9 @@
 
 import { useTranslations } from "next-intl";
 import Image from "next/image";
+import { getApiUrl } from "../../../../client/config";
 import { isDiscordAuthEnabled, isInternalAuthEnabled, isRegistrationAllowed } from "../../../../login";
 import { Button, CardDescription, CardFooter, CardHeader, CardTitle, Link } from "../../../../shadcnui";
-import { getApiUrl } from "../../../../client/config";
 import { useAuthContext } from "../../contexts";
 import { AuthComponent } from "../../enums";
 
@@ -18,10 +18,10 @@ export function LandingComponent() {
       <CardHeader className="mb-4" data-testid="page-pre-login-container">
         <CardTitle className="text-primary flex flex-col items-center gap-y-8 pb-8 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t(`generic.title`)}
+          {t(`common.title`)}
         </CardTitle>
         <CardDescription className="flex w-full justify-center text-center text-sm">
-          {t(`generic.description`)}
+          {t(`common.description`)}
         </CardDescription>
       </CardHeader>
       <CardFooter className="mt-4 flex w-full flex-col justify-between gap-y-4">
@@ -34,13 +34,13 @@ export function LandingComponent() {
                 onClick={() => setComponentType(AuthComponent.Register)}
               >
                 <Button className="w-full" variant={`default`}>
-                  {t(`foundations.auth.buttons.register`)}
+                  {t(`auth.buttons.register`)}
                 </Button>
               </Link>
             )}
             <Link href="#" className="flex w-full justify-end" onClick={() => setComponentType(AuthComponent.Login)}>
               <Button className="w-full" variant={`outline`} data-testid="page-login-button-initial-login">
-                {t(`foundations.auth.buttons.login`)}
+                {t(`auth.buttons.login`)}
               </Button>
             </Link>
           </>

package/src/features/auth/components/forms/AcceptInvitation.tsx

@@ -29,28 +29,28 @@ export function AcceptInvitation() {
         await AuthService.validateCode(payload);
       } catch (e) {
         setError(e instanceof Error ? e.message : String(e));
-        errorToast({ title: t(`generic.errors.error`), error: e });
+        errorToast({ title: t(`common.errors.error`), error: e });
       }
     }
 
     if (params && params.code) {
       validateCode(params.code);
     } else {
-      setError(t(`foundations.auth.errors.invalid_invitation_code`));
+      setError(t(`auth.errors.invalid_invitation_code`));
     }
   }, []);
 
   const formSchema = z
     .object({
       password: z.string().min(1, {
-        message: t(`foundations.user.fields.password.error`),
+        message: t(`user.fields.password.error`),
       }),
       passwordRetype: z.string().min(1, {
-        message: t("foundations.auth.errors.password_retype_required"),
+        message: t("auth.errors.password_retype_required"),
       }),
     })
     .refine((data) => data.password === data.passwordRetype, {
-      message: t("foundations.auth.fields.retype_password.error_not_match"),
+      message: t("auth.fields.retype_password.error_not_match"),
       path: ["passwordRetype"],
     });
 
@@ -74,8 +74,8 @@ export function AcceptInvitation() {
       await AuthService.acceptInvitation(payload);
       setShowConfirmation(true);
 
-      toast.success(t("foundations.auth.account_activated"), {
-        description: t("foundations.auth.account_activated_description"),
+      toast.success(t("auth.account_activated"), {
+        description: t("auth.account_activated_description"),
       });
 
       setTimeout(() => {
@@ -83,7 +83,7 @@ export function AcceptInvitation() {
         setParams(undefined);
       }, 2000);
     } catch (e) {
-      errorToast({ title: t(`generic.errors.error`), error });
+      errorToast({ title: t(`common.errors.error`), error });
     }
   };
 
@@ -92,21 +92,15 @@ export function AcceptInvitation() {
       <CardHeader>
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t("foundations.auth.accept_invitation")}
+          {t("auth.accept_invitation")}
         </CardTitle>
         <CardDescription className="text-center text-sm">
-          {error ? (
-            <>{t("foundations.auth.errors.activating_account")}</>
-          ) : (
-            <>{t("foundations.auth.select_password")}</>
-          )}
+          {error ? <>{t("auth.errors.activating_account")}</> : <>{t("auth.select_password")}</>}
         </CardDescription>
       </CardHeader>
       <CardContent>
         {showConfirmation ? (
-          <CardDescription className="text-center text-xl">
-            {t("foundations.auth.activation_description")}
-          </CardDescription>
+          <CardDescription className="text-center text-xl">{t("auth.activation_description")}</CardDescription>
         ) : error ? (
           <CardDescription className="text-center text-xl">{error}</CardDescription>
         ) : (
@@ -115,17 +109,17 @@ export function AcceptInvitation() {
               <FormPassword
                 form={form}
                 id="password"
-                name={t(`foundations.user.fields.password.label`)}
-                placeholder={t(`foundations.user.fields.password.placeholder`)}
+                name={t(`user.fields.password.label`)}
+                placeholder={t(`user.fields.password.placeholder`)}
               />
               <FormPassword
                 form={form}
                 id="passwordRetype"
-                name={t("foundations.auth.fields.retype_password.label")}
-                placeholder={t(`foundations.auth.fields.retype_password.placeholder`)}
+                name={t("auth.fields.retype_password.label")}
+                placeholder={t(`auth.fields.retype_password.placeholder`)}
               />
               <Button className="mt-4 w-full" type={"submit"}>
-                {t("foundations.auth.accept_invitation")}
+                {t("auth.accept_invitation")}
               </Button>
             </form>
           </Form>

package/src/features/auth/components/forms/ActivateAccount.tsx

@@ -28,8 +28,8 @@ export function ActivateAccount() {
 
         setParams(undefined);
 
-        toast.success(t("foundations.auth.account_activated"), {
-          description: t("foundations.auth.account_activated_description"),
+        toast.success(t("auth.account_activated"), {
+          description: t("auth.account_activated_description"),
         });
 
         setTimeout(() => {
@@ -37,14 +37,14 @@ export function ActivateAccount() {
         }, 2000);
       } catch (e) {
         setError(e instanceof Error ? e.message : String(e));
-        errorToast({ title: t(`generic.errors.error`), error: e });
+        errorToast({ title: t(`common.errors.error`), error: e });
       }
     }
 
     if (params && params.code) {
       ActivateAccount(params.code);
     } else {
-      setError(t(`foundations.auth.errors.invalid_invitation_code`));
+      setError(t(`auth.errors.invalid_invitation_code`));
     }
   }, []);
 
@@ -53,20 +53,20 @@ export function ActivateAccount() {
       <CardHeader>
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t("foundations.auth.accept_invitation")}
+          {t("auth.accept_invitation")}
         </CardTitle>
         <CardDescription className="text-center text-sm">
-          {error ? <>{t("foundations.auth.errors.activating_account")}</> : <> </>}
+          {error ? <>{t("auth.errors.activating_account")}</> : <> </>}
         </CardDescription>
       </CardHeader>
       <CardContent>
         <CardDescription className="text-center text-xl">
           {showConfirmation ? (
-            <>{t("foundations.auth.activation_description")}</>
+            <>{t("auth.activation_description")}</>
           ) : error ? (
             <>{error}</>
           ) : (
-            <>{t("foundations.auth.activation_wait")}</>
+            <>{t("auth.activation_wait")}</>
           )}
         </CardDescription>
       </CardContent>

package/src/features/auth/components/forms/ForgotPassword.tsx

@@ -29,7 +29,7 @@ export function ForgotPassword() {
 
   const formSchema = z.object({
     email: z.string().email({
-      message: t(`generic.errors.invalid_email`),
+      message: t(`common.errors.invalid_email`),
     }),
   });
 
@@ -58,15 +58,15 @@ export function ForgotPassword() {
       <CardHeader data-testid="page-forgot-password-container">
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t("foundations.auth.forgot_password")}
+          {t("auth.forgot_password")}
         </CardTitle>
         <CardDescription className="text-sm">
-          {showConfirmation ? <> </> : <>{t(`foundations.auth.add_email_to_reset`)}</>}
+          {showConfirmation ? <> </> : <>{t(`auth.add_email_to_reset`)}</>}
         </CardDescription>
       </CardHeader>
       {showConfirmation ? (
         <CardContent>
-          <CardDescription className="text-center text-xl">{t(`foundations.auth.reset_confirmation`)}</CardDescription>
+          <CardDescription className="text-center text-xl">{t(`auth.reset_confirmation`)}</CardDescription>
         </CardContent>
       ) : (
         <Form {...form}>
@@ -75,12 +75,12 @@ export function ForgotPassword() {
               <FormInput
                 form={form}
                 id="email"
-                name={t(`generic.fields.email.label`)}
-                placeholder={t(`generic.fields.email.placeholder`)}
+                name={t(`common.fields.email.label`)}
+                placeholder={t(`common.fields.email.placeholder`)}
                 testId="form-forgot-password-input-email"
               />
               <Button className="mt-4 w-full" type={"submit"} data-testid="form-forgot-password-button-reset">
-                {t(`foundations.auth.buttons.reset_password`)}
+                {t(`auth.buttons.reset_password`)}
               </Button>
             </CardContent>
             <CardFooter className="flex w-full flex-row justify-between">
@@ -89,7 +89,7 @@ export function ForgotPassword() {
                 className="flex w-full justify-start"
                 onClick={() => setComponentType(AuthComponent.Register)}
               >
-                {t("foundations.auth.buttons.register")}
+                {t("auth.buttons.register")}
               </Link> */}
               <Link
                 href="#"
@@ -97,7 +97,7 @@ export function ForgotPassword() {
                 onClick={() => setComponentType(AuthComponent.Login)}
                 data-testid="form-forgot-password-link-login"
               >
-                {t(`foundations.auth.buttons.login`)}
+                {t(`auth.buttons.login`)}
               </Link>
             </CardFooter>
           </form>

package/src/features/auth/components/forms/Login.tsx

@@ -34,9 +34,9 @@ export function Login() {
 
   const formSchema = z.object({
     email: z.string().email({
-      message: t(`generic.errors.invalid_email`),
+      message: t(`common.errors.invalid_email`),
     }),
-    password: z.string().min(3, { message: t(`foundations.auth.errors.password_too_short`) }),
+    password: z.string().min(3, { message: t(`auth.errors.password_too_short`) }),
   });
 
   const form = useForm<z.infer<typeof formSchema>>({
@@ -58,7 +58,7 @@ export function Login() {
       router.replace(generateUrl({ page: `/` }));
     } catch (e) {
       errorToast({
-        title: t(`generic.errors.error`),
+        title: t(`common.errors.error`),
         error: e,
       });
     }
@@ -69,10 +69,10 @@ export function Login() {
       <CardHeader data-testid="page-login-container">
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t("foundations.auth.login")}
+          {t("auth.login")}
         </CardTitle>
 
-        <CardDescription className="text-sm">{t(`foundations.auth.login_description`)}</CardDescription>
+        <CardDescription className="text-sm">{t(`auth.login_description`)}</CardDescription>
       </CardHeader>
       <Form {...form}>
         <form onSubmit={form.handleSubmit(onSubmit)}>
@@ -83,19 +83,19 @@ export function Login() {
                   autoFocus
                   form={form}
                   id="email"
-                  name={t(`generic.fields.email.label`)}
-                  placeholder={t(`generic.fields.email.placeholder`)}
+                  name={t(`common.fields.email.label`)}
+                  placeholder={t(`common.fields.email.placeholder`)}
                   testId="form-login-input-email"
                 />
                 <FormPassword
                   form={form}
                   id="password"
-                  name={t(`foundations.user.fields.password.label`)}
-                  placeholder={t(`foundations.user.fields.password.placeholder`)}
+                  name={t(`user.fields.password.label`)}
+                  placeholder={t(`user.fields.password.placeholder`)}
                   testId="form-login-input-password"
                 />
                 <Button className="mt-4 w-full" type={"submit"} data-testid="form-login-button-submit">
-                  {t(`foundations.auth.login`)}
+                  {t(`auth.login`)}
                 </Button>
               </>
             )}
@@ -114,7 +114,7 @@ export function Login() {
                 className="flex w-full justify-start"
                 onClick={() => setComponentType(AuthComponent.Register)}
               >
-                {t(`foundations.auth.register`)}
+                {t(`auth.register`)}
               </Link>
               <Link
                 href="#"
@@ -122,7 +122,7 @@ export function Login() {
                 onClick={() => setComponentType(AuthComponent.ForgotPassword)}
                 data-testid="form-login-link-forgot-password"
               >
-                {t(`foundations.auth.forgot_password`)}
+                {t(`auth.forgot_password`)}
               </Link>
             </div>
           </CardFooter>

package/src/features/auth/components/forms/Register.tsx

@@ -30,19 +30,19 @@ export default function Register() {
 
   const formSchema = z.object({
     company: z.string().min(1, {
-      message: t(`generic.errors.missing_company_name`),
+      message: t(`common.errors.missing_company_name`),
     }),
     name: z.string().min(1, {
-      message: t("generic.errors.missing_name"),
+      message: t("common.errors.missing_name"),
     }),
     email: z.string().email({
-      message: t(`generic.errors.invalid_email`),
+      message: t(`common.errors.invalid_email`),
     }),
     password: z
       .string()
-      .min(8, t(`foundations.auth.errors.password_too_short`))
+      .min(8, t(`auth.errors.password_too_short`))
       .regex(/^(?=.*[0-9])(?=.*[^a-zA-Z0-9]).*$/, {
-        message: t(`foundations.auth.errors.password_invalid_format`),
+        message: t(`auth.errors.password_invalid_format`),
       }),
   });
 
@@ -78,17 +78,15 @@ export default function Register() {
       <CardHeader>
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t(`foundations.auth.register`)}
+          {t(`auth.register`)}
         </CardTitle>
         <CardDescription className="text-sm">
-          {showConfirmation ? <> </> : <>{t(`foundations.auth.register_description`)}</>}
+          {showConfirmation ? <> </> : <>{t(`auth.register_description`)}</>}
         </CardDescription>
       </CardHeader>
       {showConfirmation ? (
         <CardContent>
-          <CardDescription className="text-center text-xl">
-            {t("foundations.auth.register_confirmation")}
-          </CardDescription>
+          <CardDescription className="text-center text-xl">{t("auth.register_confirmation")}</CardDescription>
         </CardContent>
       ) : (
         <Form {...form}>
@@ -98,32 +96,32 @@ export default function Register() {
                 isRequired
                 form={form}
                 id="company"
-                name={t(`foundations.company.fields.name.label`)}
-                placeholder={t(`foundations.company.fields.name.placeholder`)}
+                name={t(`company.fields.name.label`)}
+                placeholder={t(`company.fields.name.placeholder`)}
               />
               <FormInput
                 isRequired
                 form={form}
                 id="name"
-                name={t(`foundations.user.fields.name.label`)}
-                placeholder={t(`foundations.user.fields.name.placeholder`)}
+                name={t(`user.fields.name.label`)}
+                placeholder={t(`user.fields.name.placeholder`)}
               />
               <FormInput
                 isRequired
                 form={form}
                 id="email"
-                name={t(`generic.fields.email.label`)}
-                placeholder={t(`generic.fields.email.placeholder`)}
+                name={t(`common.fields.email.label`)}
+                placeholder={t(`common.fields.email.placeholder`)}
               />
               <FormPassword
                 isRequired
                 form={form}
                 id="password"
-                name={t(`foundations.user.fields.password.label`)}
-                placeholder={t(`foundations.user.fields.password.placeholder`)}
+                name={t(`user.fields.password.label`)}
+                placeholder={t(`user.fields.password.placeholder`)}
               />
               <Button className="mt-4 w-full" type={"submit"}>
-                {t(`foundations.auth.buttons.register`)}
+                {t(`auth.buttons.register`)}
               </Button>
             </CardContent>
             <CardFooter className="flex w-full flex-row justify-between">
@@ -132,14 +130,14 @@ export default function Register() {
                 className="flex w-full justify-start"
                 onClick={() => setComponentType(AuthComponent.Login)}
               >
-                {t(`foundations.auth.buttons.login`)}
+                {t(`auth.buttons.login`)}
               </Link>
               <Link
                 href="#"
                 className="flex w-full justify-end"
                 onClick={() => setComponentType(AuthComponent.ForgotPassword)}
               >
-                {t(`foundations.auth.buttons.forgot_password`)}
+                {t(`auth.buttons.forgot_password`)}
               </Link>
             </CardFooter>
           </form>

package/src/features/auth/components/forms/ResetPassword.tsx

@@ -29,28 +29,28 @@ export function ResetPassword() {
         await AuthService.validateCode(payload);
       } catch (e) {
         setError(e instanceof Error ? e.message : String(e));
-        errorToast({ title: t(`generic.errors.error`), error: e });
+        errorToast({ title: t(`common.errors.error`), error: e });
       }
     }
 
     if (params && params.code) {
       validateResetPasswordCode(params.code);
     } else {
-      setError(t(`foundations.auth.errors.invalid_password_reset_code`));
+      setError(t(`auth.errors.invalid_password_reset_code`));
     }
   }, []);
 
   const formSchema = z
     .object({
       password: z.string().min(1, {
-        message: t(`foundations.user.fields.password.error`),
+        message: t(`user.fields.password.error`),
       }),
       passwordRetype: z.string().min(1, {
-        message: t(`foundations.auth.fields.retype_password.error`),
+        message: t(`auth.fields.retype_password.error`),
       }),
     })
     .refine((data) => data.password === data.passwordRetype, {
-      message: t(`foundations.auth.fields.retype_password.error_not_match`),
+      message: t(`auth.fields.retype_password.error_not_match`),
       path: ["passwordRetype"],
     });
 
@@ -74,8 +74,8 @@ export function ResetPassword() {
       await AuthService.resetPassword(payload);
       setShowConfirmation(true);
 
-      toast.success(t(`foundations.auth.reset_success`), {
-        description: t(`foundations.auth.reset_success_description`),
+      toast.success(t(`auth.reset_success`), {
+        description: t(`auth.reset_success_description`),
       });
 
       setTimeout(() => {
@@ -83,7 +83,7 @@ export function ResetPassword() {
         setParams(undefined);
       }, 2000);
     } catch (e) {
-      errorToast({ title: t(`generic.errors.error`), error });
+      errorToast({ title: t(`common.errors.error`), error });
     }
   };
 
@@ -92,21 +92,15 @@ export function ResetPassword() {
       <CardHeader>
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t(`foundations.auth.password_reset`)}
+          {t(`auth.password_reset`)}
         </CardTitle>
         <CardDescription className="text-center text-sm">
-          {error ? (
-            <>{t(`foundations.auth.errors.password_reset_error`)}</>
-          ) : (
-            <>{t(`foundations.auth.reset_password`)}</>
-          )}
+          {error ? <>{t(`auth.errors.password_reset_error`)}</> : <>{t(`auth.reset_password`)}</>}
         </CardDescription>
       </CardHeader>
       <CardContent>
         {showConfirmation ? (
-          <CardDescription className="text-center text-xl">
-            {t(`foundations.auth.reset_success_description`)}
-          </CardDescription>
+          <CardDescription className="text-center text-xl">{t(`auth.reset_success_description`)}</CardDescription>
         ) : error ? (
           <CardDescription className="text-center text-xl">{error}</CardDescription>
         ) : (
@@ -115,7 +109,7 @@ export function ResetPassword() {
               <FormPassword form={form} id="password" name={"Password"} />
               <FormPassword form={form} id="passwordRetype" name={"Retype Password"} />
               <Button className="mt-4 w-full" type={"submit"}>
-                {t(`foundations.auth.buttons.reset_password`)}
+                {t(`auth.buttons.reset_password`)}
               </Button>
             </form>
           </Form>

package/src/features/company/components/details/TokenStatusIndicator.tsx

@@ -86,35 +86,35 @@ export function TokenStatusIndicator({ className, size = "md", showExtraPages =
 
   const tooltipContent = (
     <div className="flex flex-col gap-2 p-1">
-      <div className="font-semibold text-sm">{t("generic.tokens.status", { defaultValue: "Page Status" })}</div>
+      <div className="font-semibold text-sm">{t("billing.tokens.status", { defaultValue: "Page Status" })}</div>
       <div className="flex flex-col gap-1 text-xs">
         <div className="flex items-center justify-between gap-4">
           <span className="text-muted-foreground">
-            {t("generic.tokens.monthly", { defaultValue: "Monthly Pages" })}:
+            {t("billing.tokens.monthly", { defaultValue: "Monthly Pages" })}:
           </span>
           <span className={cn("font-medium", getStatusColor())}>
             {availableMonthlyTokens} / {monthlyTokens}
           </span>
         </div>
         <div className="flex items-center justify-between gap-4">
-          <span className="text-muted-foreground">{t("generic.tokens.available", { defaultValue: "Available" })}:</span>
+          <span className="text-muted-foreground">{t("billing.tokens.available", { defaultValue: "Available" })}:</span>
           <span className={cn("font-medium", getStatusColor())}>{percentage.toFixed(0)}%</span>
         </div>
         <Link href="/settings/billing?action=subscribe" className="w-full flex justify-end my-4">
           <Button variant="outline" size="sm">
-            {t("generic.tokens.upgrade_plan", { defaultValue: "Upgrade plan" })}
+            {t("billing.tokens.upgrade_plan", { defaultValue: "Upgrade plan" })}
           </Button>
         </Link>
         <Separator />
         <div className="flex items-center justify-between gap-4 pt-1 mt-1">
           <span className="text-muted-foreground">
-            {t("generic.tokens.available_extra", { defaultValue: "Extra Pages" })}:
+            {t("billing.tokens.available_extra", { defaultValue: "Extra Pages" })}:
           </span>
           <span className="font-medium text-blue-500">{availableExtraTokens}</span>
         </div>
         <Link href="/settings/billing?action=subscribe" className="w-full flex justify-end my-4">
           <Button variant="outline" size="sm">
-            {t("generic.tokens.purchase_extra", { defaultValue: "Purchase additional analysis" })}
+            {t("billing.tokens.purchase_extra", { defaultValue: "Purchase additional analysis" })}
           </Button>
         </Link>
       </div>
@@ -126,7 +126,7 @@ export function TokenStatusIndicator({ className, size = "md", showExtraPages =
       <TooltipTrigger>
         <div
           className={cn("inline-flex items-center gap-1.5 cursor-default", className)}
-          aria-label={t("generic.tokens.status", { defaultValue: "Page Status" })}
+          aria-label={t("billing.tokens.status", { defaultValue: "Page Status" })}
         >
           {getBatteryIcon()}
           <span className={cn(textSize, "text-muted-foreground font-medium")}>{availableMonthlyTokens}</span>

package/src/features/company/components/forms/CompanyConfigurationEditor.tsx

@@ -95,7 +95,7 @@ function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEdi
       close();
     } catch (error) {
       errorToast({
-        title: t(`generic.errors.update`),
+        title: t(`common.errors.update`),
         error,
       });
     }
@@ -110,7 +110,7 @@ function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEdi
       </DialogTrigger>
       <DialogContent className={`flex max-h-[70vh] max-w-4xl flex-col overflow-y-auto`}>
         <DialogHeader>
-          <DialogTitle>{t(`types.configurations`, { count: 2 })}</DialogTitle>
+          <DialogTitle>{t(`entities.configuration`, { count: 2 })}</DialogTitle>
           <DialogDescription className="text-destructive">
             {t(`features.configuration.warning_description`)}
           </DialogDescription>