diff --git a/src/app/calculators/espece/config.json b/src/app/calculators/espece/config.json
index e3718104c4364ea92f6eaacc948650ff5e9b5917..6b0f67aacfd15f3dd23d656fd2a1941ff1ebbd83 100644
--- a/src/app/calculators/espece/config.json
+++ b/src/app/calculators/espece/config.json
@@ -62,7 +62,7 @@
"allowEmpty": true
},
{
- "id": "VMax",
+ "id": "VeMax",
"allowEmpty": true
}
]
diff --git a/src/app/calculators/espece/en.json b/src/app/calculators/espece/en.json
index cedf49fdfc852f621a1a127d18340a6488ae3979..4dfbd866cb894ce46c45af612f71c56bffd4045b 100644
--- a/src/app/calculators/espece/en.json
+++ b/src/app/calculators/espece/en.json
@@ -5,20 +5,6 @@
"fs_param_pam": "Rock-ramp fishpasses",
"fs_param_par": "Humpback fishways",
- "DHMaxS": "Maximal fall",
- "DHMaxP": "Maximal fall",
- "BMin": "Minimal slot or weir width",
- "PMinS": "Minimal basin width",
- "PMinP": "Minimal basin width",
- "LMinS": "Minimal basin length",
- "LMinP": "Minimal basin length",
- "HMin": "Minimal head on weir",
- "YMin": "Minimal water level",
- "VMax": "Maximal flow velocity",
- "YMinSB": "Minimal water level on superactive baffles",
- "YMinPB": "Minimal water level on plane baffles",
- "PVMax": "Maximal dissipated power",
-
"UNIT_DHMaxS": "m",
"UNIT_DHMaxP": "m",
"UNIT_BMin": "m",
@@ -28,7 +14,7 @@
"UNIT_LMinP": "m",
"UNIT_HMin": "m",
"UNIT_YMin": "m",
- "UNIT_VMax": "m/s",
+ "UNIT_VeMax": "m/s",
"UNIT_YMinSB": "m",
"UNIT_YMinPB": "m",
"UNIT_PVMax": "W/m³"
diff --git a/src/app/calculators/espece/fr.json b/src/app/calculators/espece/fr.json
index 7654d4ce9117b3615c831d31c8cbac98cf41ecc1..55a20157d1d5fdaffc5e553dde239a72ddb9a048 100644
--- a/src/app/calculators/espece/fr.json
+++ b/src/app/calculators/espece/fr.json
@@ -5,20 +5,6 @@
"fs_param_pam": "Passes à macrorugosités",
"fs_param_par": "Passes à ralentisseurs",
- "DHMaxS": "Chute maximale",
- "DHMaxP": "Chute maximale",
- "BMin": "Largeur minimale de fente ou échancrure latérale",
- "PMinS": "Profondeur minimale de bassin",
- "PMinP": "Profondeur minimale de bassin",
- "LMinS": "Longueur minimale de bassin",
- "LMinP": "Longueur minimale de bassin",
- "HMin": "Charge minimale sur l'échancrure",
- "YMin": "Tirant d'eau minimal",
- "VMax": "Vitesse d'écoulement maximale",
- "YMinSB": "Tirant d'eau minimal sur les ralentisseurs suractifs de fond",
- "YMinPB": "Tirant d'eau minimal sur les ralentisseurs plans",
- "PVMax": "Puissance volumique dissipée maximale",
-
"UNIT_DHMaxS": "m",
"UNIT_DHMaxP": "m",
"UNIT_BMin": "m",
@@ -28,7 +14,7 @@
"UNIT_LMinP": "m",
"UNIT_HMin": "m",
"UNIT_YMin": "m",
- "UNIT_VMax": "m/s",
+ "UNIT_VeMax": "m/s",
"UNIT_YMinSB": "m",
"UNIT_YMinPB": "m",
"UNIT_PVMax": "W/m³"
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 92186a745e4c6424d393cdfc69d40d056a506c0a..c5095aacb19e1570fdda4f06dc1048d303505a11 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -351,6 +351,19 @@
"INFO_LIB_ZRAM": "Upstream apron elevation",
"INFO_LIB_ZRMB": "Downstream basin bottom elevation",
"INFO_LIB_ZT": "Triangle top elevation",
+ "INFO_LIB_DHMAXS": "Maximal fall",
+ "INFO_LIB_DHMAXP": "Maximal fall",
+ "INFO_LIB_BMIN": "Minimal slot or weir width",
+ "INFO_LIB_PMINS": "Minimal basin width",
+ "INFO_LIB_PMINP": "Minimal basin width",
+ "INFO_LIB_LMINS": "Minimal basin length",
+ "INFO_LIB_LMINP": "Minimal basin length",
+ "INFO_LIB_HMIN": "Minimal head on weir",
+ "INFO_LIB_YMIN": "Minimal water level",
+ "INFO_LIB_VEMAX": "Maximal flow velocity",
+ "INFO_LIB_YMINSB": "Minimal water level on superactive baffles",
+ "INFO_LIB_YMINPB": "Minimal water level on plane baffles",
+ "INFO_LIB_PVMAX": "Maximal dissipated power",
"INFO_LIB_PAB_CHART_SEUILS": "Weirs (%s)",
"INFO_LINKED_VALUE_CHILD": "%s (%s, %s %s)",
"INFO_LINKED_VALUE_EXTRA_RESULT_OF": "%s (%s)",
@@ -610,6 +623,7 @@
"INFO_PARENT_PREFIX": "%name% #%position%: ",
"INFO_PARENT_PREFIX_DOWNWALL": "downwall: ",
"ERROR_VERIF_ERRORS_IN_PASS": "Pass to verify contains errors",
+ "ERROR_VERIF_MISSING_CRITERION": "Criterion %var_criterion% must be defined",
"ERROR_VERIF_MR_VMAX": "Maximum speed %V% too high (maximum: %maxV%)",
"ERROR_VERIF_MR_PVMAX": "Dissipated power %PV% too high (maximum: %maxPV%)",
"ERROR_VERIF_MR_YMIN": "Water level %Y% too low (minimum: %minY%)",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 5788a49dcccf054aeb9686eceb0194314006f00a..6714a5327f78a492b339c85dcdcf7d201c87b8ab 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -352,6 +352,19 @@
"INFO_LIB_ZRAM": "Cote du radier amont",
"INFO_LIB_ZRMB": "Cote de radier mi-bassin",
"INFO_LIB_ZT": "Cote haute du triangle",
+ "INFO_LIB_DHMAXS": "Chute maximale",
+ "INFO_LIB_DHMAXP": "Chute maximale",
+ "INFO_LIB_BMIN": "Largeur minimale de fente ou échancrure latérale",
+ "INFO_LIB_PMINS": "Profondeur minimale de bassin",
+ "INFO_LIB_PMINP": "Profondeur minimale de bassin",
+ "INFO_LIB_LMINS": "Longueur minimale de bassin",
+ "INFO_LIB_LMINP": "Longueur minimale de bassin",
+ "INFO_LIB_HMIN": "Charge minimale sur l'échancrure",
+ "INFO_LIB_YMIN": "Tirant d'eau minimal",
+ "INFO_LIB_VEMAX": "Vitesse d'écoulement maximale",
+ "INFO_LIB_YMINSB": "Tirant d'eau minimal sur les ralentisseurs suractifs de fond",
+ "INFO_LIB_YMINPB": "Tirant d'eau minimal sur les ralentisseurs plans",
+ "INFO_LIB_PVMAX": "Puissance volumique dissipée maximale",
"INFO_LIB_PAB_CHART_SEUILS": "Seuils (%s)",
"INFO_LINKED_VALUE_CHILD": "%s (%s, %s %s)",
"INFO_LINKED_VALUE_EXTRA_RESULT_OF": "%s (%s)",
@@ -613,6 +626,7 @@
"INFO_PARENT_PREFIX_DOWNWALL": "cloison aval : ",
"ERROR_VERIF_ERRORS_IN_PASS": "La passe à vérifier contient des erreurs",
"ERROR_VERIF_VARYING_ERRORS_IN_PASS": "La passe à vérifier contient des erreurs à l'itération %i%",
+ "ERROR_VERIF_MISSING_CRITERION": "Le critère %var_criterion% doit être défini",
"ERROR_VERIF_MR_VMAX": "Vitesse maximale %V% trop élevée (maximum : %maxV%)",
"ERROR_VERIF_MR_PVMAX": "Puissance dissipée %PV% trop élevée (maximum : %maxPV%)",
"ERROR_VERIF_MR_YMIN": "Tirant d'eau %Y% insuffisant (minimum : %minY%)",