fix(ui): i18next API change

AntaresSimulatorTeam · Oct 3, 2023 · e8a8503 · e8a8503
1 parent ff8e635
commit e8a8503
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 60 deletions.
diff --git a/webapp/src/components/App/Settings/Groups/dialog/CreateGroupDialog.tsx b/webapp/src/components/App/Settings/Groups/dialog/CreateGroupDialog.tsx
@@ -46,11 +46,17 @@ function CreateGroupDialog(props: Props) {
 
     try {
       newGroup = await mounted(createGroup(name));
-      enqueueSnackbar(t("settings.success.groupCreation", [newGroup.name]), {
-        variant: "success",
-      });
+      enqueueSnackbar(
+        t("settings.success.groupCreation", { 0: newGroup.name }),
+        {
+          variant: "success",
+        },
+      );
     } catch (e) {
-      enqueueErrorSnackbar(t("settings.error.groupSave", [name]), e as Error);
+      enqueueErrorSnackbar(
+        t("settings.error.groupSave", { 0: name }),
+        e as Error,
+      );
       throw e;
     }
 
@@ -82,7 +88,7 @@ function CreateGroupDialog(props: Props) {
       reloadFetchGroups();
 
       enqueueErrorSnackbar(
-        t("settings.error.userRolesSave", [newGroup.name]),
+        t("settings.error.userRolesSave", { 0: newGroup.name }),
         e as Error,
       );
     }

diff --git a/webapp/src/components/App/Settings/Groups/dialog/UpdateGroupDialog.tsx b/webapp/src/components/App/Settings/Groups/dialog/UpdateGroupDialog.tsx
@@ -67,7 +67,7 @@ function UpdateGroupDialog(props: Props) {
     const groupName = name || group.name;
 
     const notifySuccess = R.once(() =>
-      enqueueSnackbar(t("settings.success.groupUpdate", [groupName]), {
+      enqueueSnackbar(t("settings.success.groupUpdate", { 0: groupName }), {
         variant: "success",
       }),
     );
@@ -79,7 +79,7 @@ function UpdateGroupDialog(props: Props) {
         notifySuccess();
       } catch (e) {
         enqueueErrorSnackbar(
-          t("settings.error.groupSave", [groupName]),
+          t("settings.error.groupSave", { 0: groupName }),
           e as Error,
         );
         throw e;
@@ -139,7 +139,7 @@ function UpdateGroupDialog(props: Props) {
         reloadFetchUsers();
 
         enqueueErrorSnackbar(
-          t("settings.error.groupRolesSave", [groupName]),
+          t("settings.error.groupRolesSave", { 0: groupName }),
           e as Error,
         );
       }

diff --git a/webapp/src/components/App/Settings/Groups/index.tsx b/webapp/src/components/App/Settings/Groups/index.tsx
@@ -164,13 +164,13 @@ function Groups() {
     mounted(deleteGroup(group.id))
       .then(() => {
         dispatch({ type: GroupActionKind.DELETE, payload: group.id });
-        enqueueSnackbar(t("settings.success.groupDelete", [group.name]), {
+        enqueueSnackbar(t("settings.success.groupDelete", { 0: group.name }), {
           variant: "success",
         });
       })
       .catch((err) => {
         enqueueErrorSnackbar(
-          t("settings.error.groupDelete", [group.name]),
+          t("settings.error.groupDelete", { 0: group.name }),
           err,
         );
       })
@@ -264,7 +264,7 @@ function Groups() {
           alert="warning"
           open
         >
-          {t("settings.question.deleteGroup", [groupToDelete.name])}
+          {t("settings.question.deleteGroup", { 0: groupToDelete.name })}
         </ConfirmationDialog>
       )}
       {groupToEdit && (

diff --git a/webapp/src/components/App/Settings/Tokens/dialog/CreateTokenDialog.tsx b/webapp/src/components/App/Settings/Tokens/dialog/CreateTokenDialog.tsx
@@ -55,11 +55,14 @@ function CreateTokenDialog(props: Props) {
 
       setTokenValueToDisplay(tokenValue);
 
-      enqueueSnackbar(t("settings.success.tokenCreation", [name]), {
+      enqueueSnackbar(t("settings.success.tokenCreation", { 0: name }), {
         variant: "success",
       });
     } catch (e) {
-      enqueueErrorSnackbar(t("settings.error.tokenSave", [name]), e as Error);
+      enqueueErrorSnackbar(
+        t("settings.error.tokenSave", { 0: name }),
+        e as Error,
+      );
       closeDialog();
     } finally {
       reloadFetchTokens();

diff --git a/webapp/src/components/App/Settings/Tokens/dialog/TokenInfoDialog.tsx b/webapp/src/components/App/Settings/Tokens/dialog/TokenInfoDialog.tsx
@@ -49,7 +49,7 @@ function TokenInfoDialog(props: Props) {
       titleIcon={InfoIcon}
     >
       <DialogContentText>
-        {t("settings.currentToken", [token.name])}
+        {t("settings.currentToken", { 0: token.name })}
       </DialogContentText>
       <Form config={{ defaultValues }} hideSubmitButton>
         {(formObj) => <TokenForm onlyPermissions readOnly {...formObj} />}

diff --git a/webapp/src/components/App/Settings/Tokens/index.tsx b/webapp/src/components/App/Settings/Tokens/index.tsx
@@ -168,13 +168,13 @@ function Tokens() {
     mounted(deleteBot(token.id))
       .then(() => {
         dispatch({ type: TokenActionKind.DELETE, payload: token.id });
-        enqueueSnackbar(t("settings.success.tokenDelete", [token.name]), {
+        enqueueSnackbar(t("settings.success.tokenDelete", { 0: token.name }), {
           variant: "success",
         });
       })
       .catch((err) => {
         enqueueErrorSnackbar(
-          t("settings.error.tokenDelete", [token.name]),
+          t("settings.error.tokenDelete", { 0: token.name }),
           err,
         );
       })
@@ -281,7 +281,7 @@ function Tokens() {
           alert="warning"
           open
         >
-          {t("settings.question.deleteToken", [tokenToDelete.name])}
+          {t("settings.question.deleteToken", { 0: tokenToDelete.name })}
         </ConfirmationDialog>
       )}
       {tokenToDisplayInfo && (

diff --git a/webapp/src/components/App/Settings/Users/dialog/CreateUserDialog.tsx b/webapp/src/components/App/Settings/Users/dialog/CreateUserDialog.tsx
@@ -39,12 +39,12 @@ function CreateUserDialog(props: Props) {
 
     try {
       newUser = await mounted(createUser(username, password));
-      enqueueSnackbar(t("settings.success.userCreation", [newUser.name]), {
+      enqueueSnackbar(t("settings.success.userCreation", { 0: newUser.name }), {
         variant: "success",
       });
     } catch (e) {
       enqueueErrorSnackbar(
-        t("settings.error.userSave", [username]),
+        t("settings.error.userSave", { 0: username }),
         e as Error,
       );
       throw e;
@@ -79,7 +79,7 @@ function CreateUserDialog(props: Props) {
       reloadFetchUsers();
 
       enqueueErrorSnackbar(
-        t("settings.error.userRolesSave", [newUser.name]),
+        t("settings.error.userRolesSave", { 0: newUser.name }),
         e as Error,
       );
     }

diff --git a/webapp/src/components/App/Settings/Users/dialog/UpdateUserDialog.tsx b/webapp/src/components/App/Settings/Users/dialog/UpdateUserDialog.tsx
@@ -81,15 +81,15 @@ function UpdateUserDialog(props: Props) {
 
       editUser({ id: user.id, roles });
 
-      enqueueSnackbar(t("settings.success.userUpdate", [user.name]), {
+      enqueueSnackbar(t("settings.success.userUpdate", { 0: user.name }), {
         variant: "success",
       });
     } catch (e) {
       // Because we cannot recover roles eventually deleted/created
       reloadFetchUsers();
 
       enqueueErrorSnackbar(
-        t("settings.error.userRolesSave", [user.name]),
+        t("settings.error.userRolesSave", { 0: user.name }),
         e as Error,
       );
     }
@@ -104,7 +104,7 @@ function UpdateUserDialog(props: Props) {
   return (
     <UserFormDialog
       title={t("settings.updateUser")}
-      subtitle={t("settings.currentUser", [user.name])}
+      subtitle={t("settings.currentUser", { 0: user.name })}
       titleIcon={EditIcon}
       defaultValues={defaultValues}
       onSubmit={handleSubmit}

diff --git a/webapp/src/components/App/Settings/Users/dialog/UserFormDialog/UserForm.tsx b/webapp/src/components/App/Settings/Users/dialog/UserFormDialog/UserForm.tsx
@@ -122,7 +122,7 @@ function UserForm(props: Props) {
               required: t("form.field.required") as string,
               minLength: {
                 value: PASSWORD_MIN_LENGTH,
-                message: t("form.field.minLength", [PASSWORD_MIN_LENGTH]),
+                message: t("form.field.minLength", { 0: PASSWORD_MIN_LENGTH }),
               },
             })}
           />

diff --git a/webapp/src/components/App/Settings/Users/index.tsx b/webapp/src/components/App/Settings/Users/index.tsx
@@ -147,12 +147,15 @@ function Users() {
     mounted(deleteUser(user.id))
       .then(() => {
         dispatch({ type: UserActionKind.DELETE, payload: user.id });
-        enqueueSnackbar(t("settings.success.userDelete", [user.name]), {
+        enqueueSnackbar(t("settings.success.userDelete", { 0: user.name }), {
           variant: "success",
         });
       })
       .catch((err) => {
-        enqueueErrorSnackbar(t("settings.error.userDelete", [user.name]), err);
+        enqueueErrorSnackbar(
+          t("settings.error.userDelete", { 0: user.name }),
+          err,
+        );
       })
       .finally(() => {
         setUsersInLoading((prev) => prev.filter((u) => u !== user));
@@ -244,7 +247,7 @@ function Users() {
           alert="warning"
           open
         >
-          {t("settings.question.deleteUser", [userToDelete.name])}
+          {t("settings.question.deleteUser", { 0: userToDelete.name })}
         </ConfirmationDialog>
       )}
       {userToEdit && (

diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/AdequacyPatch/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Configuration/AdequacyPatch/Fields.tsx
@@ -81,7 +81,7 @@ function Fields() {
               rules={{
                 min: {
                   value: 0,
-                  message: t("form.field.minValue", [0]),
+                  message: t("form.field.minValue", { 0: 0 }),
                 },
               }}
             />
@@ -94,7 +94,7 @@ function Fields() {
               rules={{
                 min: {
                   value: 0,
-                  message: t("form.field.minValue", [0]),
+                  message: t("form.field.minValue", { 0: 0 }),
                 },
               }}
             />
@@ -107,7 +107,7 @@ function Fields() {
               rules={{
                 min: {
                   value: 0,
-                  message: t("form.field.minValue", [0]),
+                  message: t("form.field.minValue", { 0: 0 }),
                 },
               }}
             />

diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx
@@ -85,7 +85,7 @@ function Fields(props: Props) {
     formValues,
   ) => {
     if (value < 1 || Number.isNaN(value)) {
-      return t("form.field.minValue", [1]);
+      return t("form.field.minValue", { 0: 1 });
     }
     if (formValues.firstDay > formValues.lastDay) {
       return false;
@@ -110,9 +110,9 @@ function Fields(props: Props) {
         : t("study.configuration.general.nbYears.error.derated");
     }
     if (value < 1) {
-      return t("form.field.minValue", [1]);
+      return t("form.field.minValue", { 0: 1 });
     }
-    return value <= 50000 ? true : t("form.field.maxValue", [50000]);
+    return value <= 50000 ? true : t("form.field.maxValue", { 0: 50000 });
   };
 
   ////////////////////////////////////////////////////////////////

diff --git a/.../App/Singlestudy/explore/Configuration/General/dialogs/ScenarioBuilderDialog/Rulesets.tsx b/.../App/Singlestudy/explore/Configuration/General/dialogs/ScenarioBuilderDialog/Rulesets.tsx
@@ -53,7 +53,7 @@ function Rulesets() {
       throw new Error(
         t(
           "study.configuration.general.mcScenarioBuilder.error.ruleset.rename",
-          [activeRuleset],
+          { 0: activeRuleset },
         ),
         { cause: err },
       );
@@ -71,9 +71,9 @@ function Rulesets() {
       reloadConfig();
 
       throw new Error(
-        t("study.configuration.general.mcScenarioBuilder.error.ruleset.add", [
-          name,
-        ]),
+        t("study.configuration.general.mcScenarioBuilder.error.ruleset.add", {
+          0: name,
+        }),
         { cause: err },
       );
     });
@@ -93,7 +93,7 @@ function Rulesets() {
       enqueueErrorSnackbar(
         t(
           "study.configuration.general.mcScenarioBuilder.error.ruleset.delete",
-          [activeRuleset],
+          { 0: activeRuleset },
         ),
         err,
       );
@@ -113,7 +113,7 @@ function Rulesets() {
       enqueueErrorSnackbar(
         t(
           "study.configuration.general.mcScenarioBuilder.error.ruleset.duplicate",
-          [activeRuleset],
+          { 0: activeRuleset },
         ),
         err,
       );
@@ -221,7 +221,7 @@ function Rulesets() {
         >
           {t(
             "study.configuration.general.mcScenarioBuilder.dialog.delete.text",
-            [activeRuleset],
+            { 0: activeRuleset },
           )}
         </ConfirmationDialog>
       )}

diff --git a/...pp/Singlestudy/explore/Configuration/General/dialogs/ScenarioBuilderDialog/tabs/Table.tsx b/...pp/Singlestudy/explore/Configuration/General/dialogs/ScenarioBuilderDialog/tabs/Table.tsx
@@ -103,9 +103,9 @@ function Table(props: Props) {
       reloadConfig();
 
       throw new Error(
-        t("study.configuration.general.mcScenarioBuilder.error.table", [
-          `${activeRuleset}.${symbol}`,
-        ]),
+        t("study.configuration.general.mcScenarioBuilder.error.table", {
+          0: `${activeRuleset}.${symbol}`,
+        }),
         { cause: err },
       );
     });

diff --git a/...omponents/App/Singlestudy/explore/Modelization/Areas/Hydro/Allocation/AllocationField.tsx b/...omponents/App/Singlestudy/explore/Modelization/Areas/Hydro/Allocation/AllocationField.tsx
@@ -40,7 +40,7 @@ function AllocationField({ field, index, label }: Props) {
           rules={{
             min: {
               value: 0,
-              message: t("form.field.minValue", [0]),
+              message: t("form.field.minValue", { 0: 0 }),
             },
           }}
         />

diff --git a/...ponents/App/Singlestudy/explore/Modelization/Areas/Hydro/Correlation/CorrelationField.tsx b/...ponents/App/Singlestudy/explore/Modelization/Areas/Hydro/Correlation/CorrelationField.tsx
@@ -46,11 +46,11 @@ function CorrelationField({ field, index, label }: Props) {
           rules={{
             min: {
               value: -100,
-              message: t("form.field.minValue", [-100]),
+              message: t("form.field.minValue", { 0: -100 }),
             },
             max: {
               value: 100,
-              message: t("form.field.maxValue", [100]),
+              message: t("form.field.maxValue", { 0: 100 }),
             },
           }}
           disabled={field.areaId === currentArea?.id}

diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx
@@ -106,7 +106,7 @@ function Fields() {
                 rules={{
                   min: {
                     value: 0,
-                    message: t("form.field.minValue", [0]),
+                    message: t("form.field.minValue", { 0: 0 }),
                   },
                 }}
               />

diff --git a/...xplore/Modelization/BindingConstraints/BindingConstView/AddConstraintTermDialog/index.tsx b/...xplore/Modelization/BindingConstraints/BindingConstView/AddConstraintTermDialog/index.tsx
@@ -78,7 +78,10 @@ function AddConstraintTermDialog(props: Props) {
         data = tmpValues.data as LinkCreationInfoDTO;
         if (!isOptionExist(options.links, data.area1, data.area2)) {
           enqueueSnackbar(
-            t("study.error.missingData", [t("study.area1"), t("study.area2")]),
+            t("study.error.missingData", {
+              0: t("study.area1"),
+              1: t("study.area2"),
+            }),
             { variant: "error" },
           );
           onCancel();
@@ -88,7 +91,10 @@ function AddConstraintTermDialog(props: Props) {
         data = tmpValues.data as ClusterElement;
         if (!isOptionExist(options.clusters, data.area, data.cluster)) {
           enqueueSnackbar(
-            t("study.error.missingData", [t("study.area"), t("study.cluster")]),
+            t("study.error.missingData", {
+              0: t("study.area"),
+              1: t("study.cluster"),
+            }),
             { variant: "error" },
           );
           onCancel();

diff --git a/...nts/App/Singlestudy/explore/Modelization/Map/MapConfig/Districts/UpdateDistrictDialog.tsx b/...nts/App/Singlestudy/explore/Modelization/Map/MapConfig/Districts/UpdateDistrictDialog.tsx
@@ -149,9 +149,9 @@ function UpdateDistrictDialog(props: Props) {
               open
             >
               <Typography sx={{ p: 3 }}>
-                {t("study.modelization.map.districts.delete.confirm", [
-                  districtsById[getValues("districtId")].name,
-                ])}
+                {t("study.modelization.map.districts.delete.confirm", {
+                  0: districtsById[getValues("districtId")].name,
+                })}
               </Typography>
             </ConfirmationDialog>
           )}