Merge branch 'main' into fix_nad_disconnect_lines

gridsuite · Sep 24, 2024 · 4ad7136 · 4ad7136
2 parents de4c033 + c6fc2f5
commit 4ad7136
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/components/dialogs/parameters/voltageinit/general-parameters.tsx b/src/components/dialogs/parameters/voltageinit/general-parameters.tsx
@@ -6,15 +6,15 @@
  */
 import { useFormContext, useWatch } from 'react-hook-form';
 import React, { ChangeEvent, useCallback } from 'react';
-import { ParameterSwitch } from '../widget/parameter-switch';
+import { ParameterSwitch, ParameterFloat } from '../widget';
 import { GENERAL, GENERAL_APPLY_MODIFICATIONS } from './voltage-init-parameters-form';
 import Alert from '@mui/material/Alert';
 import { styles } from '../parameters';
 import { FormattedMessage } from 'react-intl';
 import { Grid } from '@mui/material';
+import { Box } from '@mui/system';
 import { REACTIVE_SLACKS_THRESHOLD, SHUNT_COMPENSATOR_ACTIVATION_THRESHOLD } from './voltage-init-constants';
-import { ParameterFloat } from '../widget/parameter-float';
-import { ReactivePowerAdornment } from '../../dialogUtils';
+import { ReactivePowerAdornment, LineSeparator } from '../../dialogUtils';
 import { UPDATE_BUS_VOLTAGE } from 'components/utils/field-constants';
 
 export const GeneralParameters = () => {
@@ -56,6 +56,9 @@ export const GeneralParameters = () => {
                 label={'VoltageInitParametersGeneralApplyModificationsLabel'}
                 onChange={setApplyModificationsValue}
             />
+            <Box my={2}>
+                <LineSeparator />
+            </Box>
             <ParameterSwitch
                 value={updateBusVoltageWatched}
                 label={'VoltageInitParametersGeneralUpdateBusVoltageLabel'}

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -186,7 +186,7 @@
     "startVoltageInitError": "An error occurred while starting the voltage profile initialization",
     "VoltageInitParametersGeneralTabLabel": "General",
     "VoltageInitParametersGeneralApplyModificationsLabel": "Automatically apply voltage init modification",
-    "VoltageInitParametersGeneralSaveInfo": "Settings of this tab won't be saved and will be set back to default if choosing from external settings",
+    "VoltageInitParametersGeneralSaveInfo": "This option won't be saved and will be set back to its default value when choosing settings from GridExplore",
     "VoltageInitParametersGeneralUpdateBusVoltageLabel": "Update bus voltage",
     "VoltageLimits": "Voltage limits",
     "VoltageLevelFilter": "Voltage level filter",

diff --git a/src/translations/fr.json b/src/translations/fr.json
@@ -187,7 +187,7 @@
     "startVoltageInitError": "Une erreur est survenue lors de l'initialisation du plan de tension",
     "VoltageInitParametersGeneralTabLabel": "Général",
     "VoltageInitParametersGeneralApplyModificationsLabel": "Appliquer automatiquement la modification du plan de tension",
-    "VoltageInitParametersGeneralSaveInfo": "Les paramètres de cet onglet ne seront pas enregistrés et seront mis aux valeurs par défaut en cas de sélection de paramètres externes",
+    "VoltageInitParametersGeneralSaveInfo": "Cette option ne sera pas enregistrée et sera mise à la valeur par défaut en cas d'insertion de paramètres depuis GridExplore",
     "VoltageInitParametersGeneralUpdateBusVoltageLabel": "Mettre à jour tension des nœuds électriques",
     "VoltageLimits": "Limites de tension",
     "VoltageLevelFilter": "Filtre poste",