@carlonicora/nextjs-jsonapi 1.29.1 → 1.29.3

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/billing/stripe-subscription/hooks/useSubscriptionWizard.ts

@@ -1,11 +1,12 @@
 "use client";
 
 import { useCallback, useMemo, useReducer, useRef } from "react";
-import { StripeSubscriptionInterface, StripeSubscriptionService } from "../data";
-import { StripePriceInterface } from "../../stripe-price/data/stripe-price.interface";
-import { BillingInterval } from "../components/widgets/IntervalToggle";
+import { v4 } from "uuid";
 import { StripeCustomerService } from "../../stripe-customer/data/stripe-customer.service";
 import { ProrationPreviewInterface } from "../../stripe-invoice/data/stripe-invoice.interface";
+import { StripePriceInterface } from "../../stripe-price/data/stripe-price.interface";
+import { BillingInterval } from "../components/widgets/IntervalToggle";
+import { StripeSubscriptionInterface, StripeSubscriptionService } from "../data";
 
 export type WizardStep = "plan-selection" | "review" | "payment-method";
 
@@ -145,7 +146,7 @@ export function useSubscriptionWizard({ subscription, onSuccess, onClose }: UseS
       } else {
         // Create new subscription
         await StripeSubscriptionService.createSubscription({
-          id: crypto.randomUUID(),
+          id: v4(),
           priceId: state.selectedPrice.id,
         });
       }

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>

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

@@ -41,7 +41,7 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
       await CompanyService.delete({ companyId: company.id });
       router.push("/");
     } catch (error) {
-      errorToast({ title: t(`generic.errors.delete`), error: error });
+      errorToast({ title: t(`common.errors.delete`), error: error });
     }
     setIsDeleting(false);
   };
@@ -51,29 +51,31 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
       <AlertDialogTrigger>
         <Button size="sm" variant={"destructive"}>
           <Trash2Icon className="mr-3 h-3.5 w-3.5" />
-          {t(`generic.buttons.delete`)}
+          {t(`ui.buttons.delete`)}
         </Button>
       </AlertDialogTrigger>
       <AlertDialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
         <AlertDialogHeader>
-          <AlertDialogTitle>{t(`generic.delete.title`, { type: t(`types.companies`, { count: 1 }) })}</AlertDialogTitle>
+          <AlertDialogTitle>
+            {t(`common.delete.title`, { type: t(`entities.companies`, { count: 1 }) })}
+          </AlertDialogTitle>
           <AlertDialogDescription>
-            {t(`generic.delete.subtitle`, { type: t(`types.companies`, { count: 1 }) })}
+            {t(`common.delete.subtitle`, { type: t(`entities.companies`, { count: 1 }) })}
           </AlertDialogDescription>
         </AlertDialogHeader>
         <div className="text-destructive p-4 text-sm">
-          {t(`generic.delete.description`, { type: t(`types.companies`, { count: 1 }) })}
+          {t(`common.delete.description`, { type: t(`entities.companies`, { count: 1 }) })}
         </div>
         <div className="flex w-full flex-col gap-y-2">
-          <div>{t(`generic.delete.confirmation`, { type: t(`types.companies`, { count: 1 }) })}</div>
+          <div>{t(`common.delete.confirmation`, { type: t(`entities.companies`, { count: 1 }) })}</div>
           <div className="flex w-full flex-col">
             <Label className="flex items-center">
-              {t(`foundations.company.fields.name.label`)}
+              {t(`company.fields.name.label`)}
               <span className="text-destructive ml-2 font-semibold">*</span>
             </Label>
             <Input
               className={`w-full`}
-              placeholder={t(`foundations.company.fields.name.placeholder`)}
+              placeholder={t(`company.fields.name.placeholder`)}
               onChange={(e) => setCompanyName(e.target.value)}
             />
           </div>
@@ -86,7 +88,7 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
             onClick={() => setOpen(false)}
             disabled={isDeleting}
           >
-            {t(`generic.buttons.cancel`)}
+            {t(`ui.buttons.cancel`)}
           </Button>
           <Button
             type="submit"
@@ -99,11 +101,11 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
           >
             {isDeleting ? (
               <>
-                {t(`generic.buttons.is_deleting`)}
+                {t(`ui.buttons.is_deleting`)}
                 <LoaderCircleIcon className="animate-spin-slow h-5 w-5" />
               </>
             ) : (
-              t(`generic.buttons.delete`)
+              t(`ui.buttons.delete`)
             )}
           </Button>
         </div>

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

@@ -54,7 +54,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
   const formSchema = z.object({
     id: z.uuidv4(),
     name: z.string().min(1, {
-      message: t(`foundations.company.fields.name.error`),
+      message: t(`company.fields.name.error`),
     }),
     featureIds: z.array(z.string()).optional(),
     moduleIds: z.array(z.string()).optional(),
@@ -110,7 +110,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
       }
     } catch (error) {
       errorToast({
-        title: company ? t(`generic.errors.update`) : t(`generic.errors.create`),
+        title: company ? t(`common.errors.update`) : t(`common.errors.create`),
         error,
       });
     }
@@ -186,7 +186,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
       <DialogContent
         className={`flex max-h-[70vh] w-full ${isAdministrator || canAccessFeatures ? `max-w-5xl` : `max-w-4xl`} flex-col overflow-y-auto`}
       >
-        <CommonEditorHeader type={t(`types.companies`, { count: 1 })} name={company?.name} />
+        <CommonEditorHeader type={t(`entities.companies`, { count: 1 })} name={company?.name} />
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)} className={`flex w-full flex-col gap-y-4`}>
             <div className="flex w-full items-start justify-between gap-x-4">
@@ -205,9 +205,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
                         ) : (
                           <>
                             <UploadIcon className="my-4 h-8 w-8" />
-                            <p className="mb-1 flex w-full text-center text-sm">
-                              {t(`foundations.company.click_drag_logo`)}
-                            </p>
+                            <p className="mb-1 flex w-full text-center text-sm">{t(`company.click_drag_logo`)}</p>
                           </>
                         )}
                       </div>
@@ -219,18 +217,14 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }: Comp
                 <FormInput
                   form={form}
                   id="name"
-                  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`)}
                 />
               </div>
               {canAccessFeatures && (
                 <div className={`flex w-96 flex-col justify-start gap-y-4`}>
                   <ScrollArea className="h-max">
-                    <FormFeatures
-                      form={form}
-                      name={t(`foundations.company.features_and_modules`)}
-                      features={features}
-                    />
+                    <FormFeatures form={form} name={t(`company.features_and_modules`)} features={features} />
                   </ScrollArea>
                 </div>
               )}

package/src/features/company/components/lists/CompaniesList.tsx

@@ -26,7 +26,7 @@ export function CompaniesList() {
       fields={[CompanyFields.name, CompanyFields.createdAt]}
       tableGeneratorType={Modules.Company}
       functions={functions}
-      title={t(`types.companies`, { count: 2 })}
+      title={t(`entities.companies`, { count: 2 })}
     />
   );
 }

package/src/features/company/contexts/CompanyContext.tsx

@@ -53,7 +53,7 @@ export const CompanyProvider = ({ children, dehydratedCompany }: CompanyProvider
 
   const title = () => {
     const response: any = {
-      type: t(`types.companies`, { count: company ? 1 : 2 }),
+      type: t(`entities.companies`, { count: company ? 1 : 2 }),
     };
 
     if (company) response.element = company.name;

package/src/features/company/hooks/useCompanyTableStructure.tsx

@@ -41,7 +41,7 @@ export const useCompanyTableStructure: UseTableStructureHook<CompanyInterface, C
     [CompanyFields.name]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.user.fields.name.label`),
+      header: t(`user.fields.name.label`),
       cell: ({ row }: { row: Row<TableContent<CompanyInterface>> }) => {
         const company = row.original.jsonApiData as CompanyInterface;
         return (
@@ -66,7 +66,7 @@ export const useCompanyTableStructure: UseTableStructureHook<CompanyInterface, C
     [CompanyFields.createdAt]: () =>
       cellDate({
         name: "createdAt",
-        title: t(`generic.date.create`),
+        title: t(`common.date.create`),
       }),
   };
 

package/src/features/content/components/lists/ContentsList.tsx

@@ -17,7 +17,7 @@ export function ContentsList({ contentList }: ContentsListProps) {
 
   return (
     <div className="flex min-h-0 w-full flex-col overflow-y-auto">
-      <h2 className="text-xl font-semibold">{t(`foundations.content.news`)}</h2>
+      <h2 className="text-xl font-semibold">{t(`content.news`)}</h2>
       <div className="flex flex-col">
         {contentList.map((content) => (
           <ContentsListElement content={content} key={content.id} />

package/src/features/content/components/lists/ContentsListById.tsx

@@ -25,7 +25,7 @@ export function ContentsListById({ contentIds }: ContentsListByIdProps) {
       data={data}
       fields={[ContentFields.name, ContentFields.authors, ContentFields.updatedAt]}
       tableGeneratorType={Modules.Content}
-      title={t(`generic.relevant`)}
+      title={t(`common.relevant`)}
     />
   );
 }

package/src/features/content/components/lists/RelevantContentsList.tsx

@@ -25,7 +25,7 @@ export function RelevantContentsList({ id }: RelevantContentsListProps) {
       data={data}
       fields={[ContentFields.name, ContentFields.authors, ContentFields.relevance, ContentFields.updatedAt]}
       tableGeneratorType={Modules.Content}
-      title={t(`generic.relevant`)}
+      title={t(`common.relevant`)}
     />
   );
 }

package/src/features/content/hooks/useContentTableStructure.tsx

@@ -39,7 +39,7 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.name]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.content.fields.name.label`),
+      header: t(`content.fields.name.label`),
       cell: ({ row }: { row: TableContent<ContentInterface> }) => {
         const content: ContentInterface = row.original.jsonApiData;
 
@@ -64,7 +64,7 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.relevance]: () => ({
       id: "relevance",
       accessorKey: "relevance",
-      header: t(`generic.relevance`),
+      header: t(`common.relevance`),
       cell: ({ row }: { row: TableContent<ContentInterface> }) => {
         const content: ContentInterface = row.original.jsonApiData;
 
@@ -92,7 +92,7 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.authors]: () => ({
       id: "authors",
       accessorKey: "authors",
-      header: t(`generic.relationships.author.label`),
+      header: t(`common.relationships.author.label`),
       cell: ({ row }: { row: TableContent<ContentInterface> }) => {
         const content: ContentInterface = row.original.jsonApiData;
         return <ContributorsList content={content} />;
@@ -103,12 +103,12 @@ export const useContentTableStructure = <U extends string = ContentFields>(
     [ContentFields.createdAt]: () =>
       cellDate({
         name: "createdAt",
-        title: t(`generic.date.create`),
+        title: t(`common.date.create`),
       }),
     [ContentFields.updatedAt]: () =>
       cellDate({
         name: "updatedAt",
-        title: t(`generic.date.update`),
+        title: t(`common.date.update`),
       }),
   };
 

package/src/features/notification/components/containers/NotificationsListContainer.tsx

@@ -23,11 +23,11 @@ function NotificationsListContainerContent() {
 
   const tabs: Tab[] = [
     {
-      label: t(`foundations.notification.inbox`),
+      label: t(`notification.inbox`),
       content: <NotificationsList archived={false} />,
     },
     {
-      label: t(`foundations.notification.archived`),
+      label: t(`notification.archived`),
       content: <NotificationsList archived={true} />,
     },
   ];

package/src/features/notification/components/lists/NotificationsList.tsx

@@ -78,7 +78,7 @@ export function NotificationsList({ archived }: NotificationsListProps) {
                   )}
                   <div className="flex w-full flex-col">
                     <p className="text-sm">
-                      {t.rich(`foundations.notification.${notification.notificationType}.description` as any, {
+                      {t.rich(`notification.${notification.notificationType}.description` as any, {
                         strong: (chunks: any) => <strong>{chunks}</strong>,
                         actor: notificationData.actor?.name ?? "",
                         title: notificationData.title,
@@ -92,7 +92,7 @@ export function NotificationsList({ archived }: NotificationsListProps) {
                     {notificationData.url ? (
                       <Link href={notificationData.url}>
                         <Button variant={`outline`} size={`sm`} onClick={(e) => e.stopPropagation()}>
-                          {t(`foundations.notification.${notification.notificationType}.buttons.action` as any)}
+                          {t(`notification.${notification.notificationType}.buttons.action` as any)}
                         </Button>
                       </Link>
                     ) : (
@@ -113,7 +113,7 @@ export function NotificationsList({ archived }: NotificationsListProps) {
                             <ArchiveIcon className="h-4 w-4 cursor-pointer" />
                           </Button>
                         </TooltipTrigger>
-                        <TooltipContent>{t(`foundations.notification.buttons.archive`)}</TooltipContent>
+                        <TooltipContent>{t(`notification.buttons.archive`)}</TooltipContent>
                       </Tooltip>
                     )}
                   </div>

package/src/features/notification/components/modals/NotificationModal.tsx

@@ -196,13 +196,13 @@ function NotificationModalContent({ isOpen, setIsOpen }: NotificationModalProps)
           <BellIcon
             className={`h-5 w-5 cursor-pointer ${unreadNotifications ? "text-destructive" : ""} ${isLoading ? "animate-pulse" : ""}`}
           />
-          {t(`types.notifications`, { count: 2 })}
+          {t(`entities.notifications`, { count: 2 })}
         </SidebarMenuButton>
       </PopoverTrigger>
       <PopoverContent className="relative left-10 w-80 border-0 p-0 shadow-none">
         <Card>
           <CardHeader className="p-4">
-            <CardTitle>{t(`types.notifications`, { count: 2 })}</CardTitle>
+            <CardTitle>{t(`entities.notifications`, { count: 2 })}</CardTitle>
             {isLoading && <div className="text-muted-foreground text-xs">Loading...</div>}
             {error && <div className="text-destructive text-xs">Error: {error}</div>}
           </CardHeader>
@@ -213,9 +213,7 @@ function NotificationModalContent({ isOpen, setIsOpen }: NotificationModalProps)
                 <Fragment key={notification.id}>{generateNotification(notification, () => setIsOpen(false))}</Fragment>
               ))
             ) : (
-              <div className="p-4 text-center text-sm text-gray-500">
-                {t(`foundations.notification.empty`, { count: 2 })}
-              </div>
+              <div className="p-4 text-center text-sm text-gray-500">{t(`notification.empty`)}</div>
             )}
           </ScrollArea>
         </Card>

package/src/features/notification/components/notifications/Notification.tsx

@@ -45,7 +45,7 @@ export function NotificationToast(
   const data = generateNotificationData({ notification: notification, generateUrl: generateUrl });
 
   return {
-    title: t(`foundations.notification.${notification.notificationType}.title`),
+    title: t(`notification.${notification.notificationType}.title`),
     description: (
       <div className={`flex w-full flex-row items-center p-2`}>
         {data.actor ? (
@@ -57,7 +57,7 @@ export function NotificationToast(
         )}
         <div className="flex w-full flex-col">
           <p className="text-sm">
-            {t.rich(`foundations.notification.${notification.notificationType}.description`, {
+            {t.rich(`notification.${notification.notificationType}.description`, {
               strong: (chunks: any) => <strong>{chunks}</strong>,
               actor: data.actor?.name ?? "",
               title: data.title,
@@ -72,7 +72,7 @@ export function NotificationToast(
     ),
     action: data.url
       ? {
-          label: t(`foundations.notification.${notification.notificationType}.buttons.action`),
+          label: t(`notification.${notification.notificationType}.buttons.action`),
           onClick: () => {
             reouter.push(data.url!);
           },
@@ -103,7 +103,7 @@ export function NotificationMenuItem({ notification, closePopover }: TaskComment
       )}
       <div className="flex w-full flex-col">
         <p className="text-sm">
-          {t.rich(`foundations.notification.${notification.notificationType}.description` as any, {
+          {t.rich(`notification.${notification.notificationType}.description` as any, {
             strong: (chunks: any) => <strong>{chunks}</strong>,
             actor: data.actor?.name ?? "",
             title: data.title,