From d57150314a53bb3f9fd40144abac867257240edc Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Thu, 20 Jun 2024 15:15:52 +0000
Subject: [PATCH 01/12] Feat: add translations  on water line warning Refs #675

---
 src/locale/messages.en.json | 1 +
 src/locale/messages.fr.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index c264bcf87..a66b4976e 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -725,6 +725,7 @@
     "WARNING_SESSION_LOAD_NOTES_MERGED": "Notes have been merged",
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "Value of %symbol% was rounded to %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Number of results is limited by linked result %symbol%",
+    "WARNING_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the fish pass deduced from the normal depth (%YnValue%m) is higher than the critical level (%criticalElevation%m). The weir upstream of the fish pass is likely to no longer be in free flow.",
     "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
     "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
     "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "Given spacing value is more than 10% lower or more than 5% greater than standard value %stdP%",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index af0f87b73..1dc8de610 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -726,6 +726,7 @@
     "WARNING_SESSION_LOAD_NOTES_MERGED": "Les notes ont été fusionnées",
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "La valeur de %symbol% a été arrondie à %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Le nombre de résultats est limité par le résultat lié %symbol%",
+    "WARNING_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote critique (%criticalElevation%m). Le déversoir à l'amont de la passe est susceptible de ne plus être dénoyé.",
     "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
     "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
     "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "La valeur d'espacement fournie est plus de 10% plus petite ou plus de 5% plus grande que la valeur standard %stdP%",
-- 
GitLab


From d10c85f6338c1416f3fc9360f23ba1247196bf68 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Thu, 20 Jun 2024 15:30:52 +0000
Subject: [PATCH 02/12] feat: add translations on error message when water line
 is to high Refs #675

---
 src/locale/messages.en.json | 1 +
 src/locale/messages.fr.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index a66b4976e..e9c3f128b 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -725,6 +725,7 @@
     "WARNING_SESSION_LOAD_NOTES_MERGED": "Notes have been merged",
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "Value of %symbol% was rounded to %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Number of results is limited by linked result %symbol%",
+    "ERROR_WATERLINE_TOO_HIGHT": "Radier n°%number%: The water level upstream of the pass deduced from the normal depth (%YnValue%m) is higher than the water level upstream of the pass (%elevation%m), flow through the pass is impossible.",
     "WARNING_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the fish pass deduced from the normal depth (%YnValue%m) is higher than the critical level (%criticalElevation%m). The weir upstream of the fish pass is likely to no longer be in free flow.",
     "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
     "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 1dc8de610..535a0c6e8 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -726,6 +726,7 @@
     "WARNING_SESSION_LOAD_NOTES_MERGED": "Les notes ont été fusionnées",
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "La valeur de %symbol% a été arrondie à %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Le nombre de résultats est limité par le résultat lié %symbol%",
+    "ERROR_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote de l'eau amont de la passe (%elevation%m), l'écoulement dans la passe est impossible.",
     "WARNING_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote critique (%criticalElevation%m). Le déversoir à l'amont de la passe est susceptible de ne plus être dénoyé.",
     "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
     "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
-- 
GitLab


From 1d0bce2c82e13b3bfa39a06858486ced3b6930a2 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Fri, 21 Jun 2024 08:20:53 +0000
Subject: [PATCH 03/12] refactor: change error message code according to jalhyd
 in translation files Refs #675

---
 src/locale/messages.en.json | 4 ++--
 src/locale/messages.fr.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index e9c3f128b..42e2b190d 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -725,8 +725,8 @@
     "WARNING_SESSION_LOAD_NOTES_MERGED": "Notes have been merged",
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "Value of %symbol% was rounded to %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Number of results is limited by linked result %symbol%",
-    "ERROR_WATERLINE_TOO_HIGHT": "Radier n°%number%: The water level upstream of the pass deduced from the normal depth (%YnValue%m) is higher than the water level upstream of the pass (%elevation%m), flow through the pass is impossible.",
-    "WARNING_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the fish pass deduced from the normal depth (%YnValue%m) is higher than the critical level (%criticalElevation%m). The weir upstream of the fish pass is likely to no longer be in free flow.",
+    "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: The water level upstream of the pass deduced from the normal depth (%YnValue%m) is higher than the water level upstream of the pass (%elevation%m), flow through the pass is impossible.",
+    "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the fish pass deduced from the normal depth (%YnValue%m) is higher than the critical level (%criticalElevation%m). The weir upstream of the fish pass is likely to no longer be in free flow.",
     "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
     "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
     "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "Given spacing value is more than 10% lower or more than 5% greater than standard value %stdP%",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 535a0c6e8..398e1f4cf 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -726,8 +726,8 @@
     "WARNING_SESSION_LOAD_NOTES_MERGED": "Les notes ont été fusionnées",
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "La valeur de %symbol% a été arrondie à %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Le nombre de résultats est limité par le résultat lié %symbol%",
-    "ERROR_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote de l'eau amont de la passe (%elevation%m), l'écoulement dans la passe est impossible.",
-    "WARNING_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote critique (%criticalElevation%m). Le déversoir à l'amont de la passe est susceptible de ne plus être dénoyé.",
+    "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote de l'eau amont de la passe (%elevation%m), l'écoulement dans la passe est impossible.",
+    "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote critique (%criticalElevation%m). Le déversoir à l'amont de la passe est susceptible de ne plus être dénoyé.",
     "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
     "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
     "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "La valeur d'espacement fournie est plus de 10% plus petite ou plus de 5% plus grande que la valeur standard %stdP%",
-- 
GitLab


From 586584ed048878136ff3ba87d9e04e7cd7448e96 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Fri, 21 Jun 2024 09:07:01 +0000
Subject: [PATCH 04/12] fix: change rugofond multiple warning message code
 according to jalhyd Refs #675

---
 src/locale/messages.en.json | 4 ++--
 src/locale/messages.fr.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 42e2b190d..785040d47 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -727,8 +727,8 @@
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Number of results is limited by linked result %symbol%",
     "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: The water level upstream of the pass deduced from the normal depth (%YnValue%m) is higher than the water level upstream of the pass (%elevation%m), flow through the pass is impossible.",
     "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the fish pass deduced from the normal depth (%YnValue%m) is higher than the critical level (%criticalElevation%m). The weir upstream of the fish pass is likely to no longer be in free flow.",
-    "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
-    "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
+    "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
+    "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
     "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "Given spacing value is more than 10% lower or more than 5% greater than standard value %stdP%",
     "ERROR_PAR_QSTAR_OUT_OF_RANGE": "Flow value %val% is outside of validity interval [ %min%, %max% ] given by abacuses",
     "ERROR_PAR_HA_OUT_OF_RANGE": "Upstream head value %val% is outside of validity interval [ %min%, %max% ] given by abacuses",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 398e1f4cf..72318c9da 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -728,8 +728,8 @@
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Le nombre de résultats est limité par le résultat lié %symbol%",
     "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote de l'eau amont de la passe (%elevation%m), l'écoulement dans la passe est impossible.",
     "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote critique (%criticalElevation%m). Le déversoir à l'amont de la passe est susceptible de ne plus être dénoyé.",
-    "WARNING_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
-    "WARNING_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
+    "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
+    "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
     "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "La valeur d'espacement fournie est plus de 10% plus petite ou plus de 5% plus grande que la valeur standard %stdP%",
     "ERROR_PAR_QSTAR_OUT_OF_RANGE": "La valeur %val% du débit sort de l'intervalle de validité [ %min%, %max% ] donné par les abaques",
     "ERROR_PAR_HA_OUT_OF_RANGE": "La valeur %val% de la charge amont sort de l'intervalle de validité [ %min%, %max% ] donné par les abaques",
-- 
GitLab


From 01c6d85cf24f6f5248d7e8719a0a561618fd67d9 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Fri, 21 Jun 2024 09:24:36 +0000
Subject: [PATCH 05/12] fix: delete unnecessary messages translations Refs #675

---
 src/locale/messages.en.json | 2 --
 src/locale/messages.fr.json | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 785040d47..e4d411312 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -82,8 +82,6 @@
     "ERROR_STRUCTURE_Q_TROP_ELEVE": "The flow passing through the other devices is too high: the requested parameter is not calculable.",
     "ERROR_STRUCTURE_ZDV_PAS_CALCULABLE": "Parameter \"Crest elevation\" cannot be calculated with this discharge law",
     "ERROR_STRUCTURE_Z_EGAUX_Q_NON_NUL": "Upstream and downstream elevations are equal but flow is not null",
-    "WARNING_COEF_DEBIT_NULL": "Apron n°%number%: Value of calculated parameter is null when discharge coefficient is null",
-    "ERROR_D65_NULL": "Calculation is impossible when d65 is null",
     "INFO_CALCULATOR_CALC_NAME": "Calculator name",
     "INFO_CALCULATOR_CALCULER": "Compute",
     "INFO_CALCULATOR_CLONE": "Duplicate",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 72318c9da..09500ae4d 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -82,8 +82,6 @@
     "ERROR_STRUCTURE_Q_TROP_ELEVE": "Le débit passant par les autres ouvrages est trop élevé&nbsp;: le paramètre demandé n'est pas calculable.",
     "ERROR_STRUCTURE_ZDV_PAS_CALCULABLE": "Le paramètre \"Cote de radier\" ne peut pas être calculé avec cette loi de débit",
     "ERROR_STRUCTURE_Z_EGAUX_Q_NON_NUL": "Les cotes amont aval sont égales et le débit n'est pas nul",
-    "WARNING_COEF_DEBIT_NULL": "Radier n°%number%: valeur du parametre calculé nul car le coefficient de débit est nul",
-    "ERROR_D65_NULL": "Le calcul impossible à cause d'un d65 nul",
     "INFO_CALCULATOR_CALC_NAME": "Nom du module de calcul",
     "INFO_CALCULATOR_CALCULER": "Calculer",
     "INFO_CALCULATOR_CLONE": "Dupliquer",
-- 
GitLab


From 0d40b27b6af3b4329c0b54a6c4d47ff54b14f625 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Fri, 21 Jun 2024 13:47:54 +0000
Subject: [PATCH 06/12] feat: improve precision of slope warning message Refs
 #675

---
 src/locale/messages.en.json | 3 ++-
 src/locale/messages.fr.json | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index e4d411312..fbcf6eefb 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -723,7 +723,8 @@
     "WARNING_SESSION_LOAD_NOTES_MERGED": "Notes have been merged",
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "Value of %symbol% was rounded to %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Number of results is limited by linked result %symbol%",
-    "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: The water level upstream of the pass deduced from the normal depth (%YnValue%m) is higher than the water level upstream of the pass (%elevation%m), flow through the pass is impossible.",
+    "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the pass deduced from the normal depth (%YnValue%m) is higher than the water level upstream of the pass (%elevation%m), flow through the pass is impossible.",
+    "WARNING_RUGOFOND_SLOPE_OUT_OF_RANGE": "The slope of the pass (%slope%%) is outside the range of validity of the normal depth formula (2 to 15%)",
     "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Apron n°%number%: The water level upstream of the fish pass deduced from the normal depth (%YnValue%m) is higher than the critical level (%criticalElevation%m). The weir upstream of the fish pass is likely to no longer be in free flow.",
     "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_LOWER_THAN_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is lower than the upstream bottom elevation of the ramp",
     "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_EQUAL_TO_ZF1": "Apron n°%number%: calculated flow is null because upstream elevation is equal to the upstream bottom elevation of the ramp",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 09500ae4d..4cd2a222a 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -725,6 +725,7 @@
     "WARNING_VALUE_ROUNDED_TO_INTEGER": "La valeur de %symbol% a été arrondie à %rounded%",
     "WARNING_VARIATED_LENGTH_LIMITED_BY_LINKED_RESULT": "Le nombre de résultats est limité par le résultat lié %symbol%",
     "ERROR_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote de l'eau amont de la passe (%elevation%m), l'écoulement dans la passe est impossible.",
+    "WARNING_RUGOFOND_SLOPE_OUT_OF_RANGE": "La pente de la passe (%slope%%) est en dehors du domaine de validité de la formule du tirant d'eau normal (2 à 15 %)",
     "WARNING_RUGOFOND_WATERLINE_TOO_HIGHT": "Radier n°%number%: La cote de l'eau amont de la passe déduite du tirant d'eau normal (%YnValue%m) est supérieure à la cote critique (%criticalElevation%m). Le déversoir à l'amont de la passe est susceptible de ne plus être dénoyé.",
     "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_LOWER_THAN_ZF1": "Radier n°%number%: le débit calculé est nul car la cote amont est plus basse que la cote de fond amont de la rampe",
     "WARNING_RUGOFOND_MULTIPLE_ELEVATION_Z1_EQUAL_TO_ZF1": "Radier n°%number%: le débit calculé est nul car la cote de l'eau amont est égale à la cote de fond amont de la rampe",
-- 
GitLab


From 014ff6ea3ca8183e9e41adbc374de3cef34836ef Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Fri, 21 Jun 2024 14:52:24 +0000
Subject: [PATCH 07/12] fix: change rugofond multiple title Refs #675

---
 src/locale/messages.fr.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 4cd2a222a..b72e61cb0 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -516,9 +516,9 @@
     "INFO_PARALLELSTRUCTURE_TITRE_COURT": "Ouvrages",
     "INFO_PARALLELSTRUCTURE_TITRE": "Lois d'ouvrages",
     "INFO_PAR_TITRE": "Passe à ralentisseurs&nbsp;: calage",
-    "INFO_RUGOFOND_TITRE": "Passe à rugosité de fond",
+    "INFO_RUGOFOND_TITRE": "Passe à rugosités de fond",
     "INFO_RUGOFOND_TITRE_COURT": "Rugofond",
-    "INFO_RUGOFONDMULTIPLE_TITRE": "Passe à rugosité de fond",
+    "INFO_RUGOFONDMULTIPLE_TITRE": "Passe à rugosités de fond",
     "INFO_RUGOFONDMULTIPLE_TITRE_COURT": "Rugofond",
     "INFO_PAR_DESCRIPTION": "plans Denil Fatou fonds suractifs mixte chevrons canoë",
     "INFO_PAR_TITRE_COURT": "PAR&nbsp;: calage",
-- 
GitLab


From 49a676e81476ee44a3d8e2bfd8b2e1de06695b37 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Mon, 24 Jun 2024 15:09:14 +0000
Subject: [PATCH 08/12] fix: display unit in rugofond multiple extra results
 Refs #676

---
 src/app/calculators/rugofondmultiple/en.json | 9 ++++++++-
 src/app/calculators/rugofondmultiple/fr.json | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/app/calculators/rugofondmultiple/en.json b/src/app/calculators/rugofondmultiple/en.json
index e16c1d7d3..9e6b2094b 100644
--- a/src/app/calculators/rugofondmultiple/en.json
+++ b/src/app/calculators/rugofondmultiple/en.json
@@ -22,5 +22,12 @@
     "d65": "d65",
 
     "PASSTYPE_0": "Horizontal aprons",
-    "PASSTYPE_1": "Inclined apron"
+    "PASSTYPE_1": "Inclined apron",
+
+    "UNIT_Q": "m³/s",
+    "UNIT_KS": "SI",
+    "UNIT_VDEB": "m/s",
+    "UNIT_YN": "m",
+    "UNIT_LINCL": "m/m"
+
 }
\ No newline at end of file
diff --git a/src/app/calculators/rugofondmultiple/fr.json b/src/app/calculators/rugofondmultiple/fr.json
index 6a2ab4707..212850ae1 100644
--- a/src/app/calculators/rugofondmultiple/fr.json
+++ b/src/app/calculators/rugofondmultiple/fr.json
@@ -22,5 +22,11 @@
     "d65": "d65",
     
     "PASSTYPE_0": "Radier horizontal",
-    "PASSTYPE_1": "Radier incliné"
+    "PASSTYPE_1": "Radier incliné",
+
+    "UNIT_Q": "m³/s",
+    "UNIT_KS": "SI",
+    "UNIT_VDEB": "m/s",
+    "UNIT_YN": "m",
+    "UNIT_LINCL": "m/m"
 }
\ No newline at end of file
-- 
GitLab


From b6d24ec164e214907b49e88417acd57eef17a797 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Mon, 24 Jun 2024 15:52:41 +0000
Subject: [PATCH 09/12] fix: add units to extra results macrorugo compounds
 Refs #676

---
 src/app/calculators/macrorugocompound/en.json | 10 +++++++++-
 src/app/calculators/macrorugocompound/fr.json | 11 ++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/app/calculators/macrorugocompound/en.json b/src/app/calculators/macrorugocompound/en.json
index 74a0abf89..262c5e843 100644
--- a/src/app/calculators/macrorugocompound/en.json
+++ b/src/app/calculators/macrorugocompound/en.json
@@ -22,5 +22,13 @@
     "xCenter": "Mid-apron abscissa",
 
     "PASSTYPE_0": "Multiple aprons",
-    "PASSTYPE_1": "Inclined apron"
+    "PASSTYPE_1": "Inclined apron",
+
+    "UNIT_VDEB": "m/s",
+    "UNIT_PV": "W/m³",
+    "UNIT_VMAX": "m/s",
+    "UNIT_VG": "m/s",
+    "UNIT_ZF2": "m",
+    "UNIT_STRICKLER": "SI",
+    "UNIT_XCENTER": "m"
 }
\ No newline at end of file
diff --git a/src/app/calculators/macrorugocompound/fr.json b/src/app/calculators/macrorugocompound/fr.json
index 642bdf907..fd3a7e8aa 100644
--- a/src/app/calculators/macrorugocompound/fr.json
+++ b/src/app/calculators/macrorugocompound/fr.json
@@ -22,5 +22,14 @@
     "xCenter": "Abscisse du milieu du radier",
 
     "PASSTYPE_0": "Radiers multiples",
-    "PASSTYPE_1": "Radier incliné"
+    "PASSTYPE_1": "Radier incliné",
+
+    "UNIT_VDEB": "m/s",
+    "UNIT_PV": "W/m³",
+    "UNIT_VMAX": "m/s",
+    "UNIT_VG": "m/s",
+    "UNIT_ZF2": "m",
+    "UNIT_STRICKLER": "SI",
+    "UNIT_XCENTER": "m"
+
 }
\ No newline at end of file
-- 
GitLab


From 73709350df064789218834eaf7c709aa2482e2b2 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Tue, 25 Jun 2024 14:35:15 +0000
Subject: [PATCH 10/12] fix: remove extra result unit keys in rugofond multiple
 and macrorugocompound Refs #676

---
 src/app/calculators/macrorugocompound/en.json | 10 +---------
 src/app/calculators/macrorugocompound/fr.json | 11 +----------
 src/app/calculators/rugofondmultiple/en.json  |  9 +--------
 src/app/calculators/rugofondmultiple/fr.json  |  8 +-------
 4 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/app/calculators/macrorugocompound/en.json b/src/app/calculators/macrorugocompound/en.json
index 262c5e843..74a0abf89 100644
--- a/src/app/calculators/macrorugocompound/en.json
+++ b/src/app/calculators/macrorugocompound/en.json
@@ -22,13 +22,5 @@
     "xCenter": "Mid-apron abscissa",
 
     "PASSTYPE_0": "Multiple aprons",
-    "PASSTYPE_1": "Inclined apron",
-
-    "UNIT_VDEB": "m/s",
-    "UNIT_PV": "W/m³",
-    "UNIT_VMAX": "m/s",
-    "UNIT_VG": "m/s",
-    "UNIT_ZF2": "m",
-    "UNIT_STRICKLER": "SI",
-    "UNIT_XCENTER": "m"
+    "PASSTYPE_1": "Inclined apron"
 }
\ No newline at end of file
diff --git a/src/app/calculators/macrorugocompound/fr.json b/src/app/calculators/macrorugocompound/fr.json
index fd3a7e8aa..642bdf907 100644
--- a/src/app/calculators/macrorugocompound/fr.json
+++ b/src/app/calculators/macrorugocompound/fr.json
@@ -22,14 +22,5 @@
     "xCenter": "Abscisse du milieu du radier",
 
     "PASSTYPE_0": "Radiers multiples",
-    "PASSTYPE_1": "Radier incliné",
-
-    "UNIT_VDEB": "m/s",
-    "UNIT_PV": "W/m³",
-    "UNIT_VMAX": "m/s",
-    "UNIT_VG": "m/s",
-    "UNIT_ZF2": "m",
-    "UNIT_STRICKLER": "SI",
-    "UNIT_XCENTER": "m"
-
+    "PASSTYPE_1": "Radier incliné"
 }
\ No newline at end of file
diff --git a/src/app/calculators/rugofondmultiple/en.json b/src/app/calculators/rugofondmultiple/en.json
index 9e6b2094b..e16c1d7d3 100644
--- a/src/app/calculators/rugofondmultiple/en.json
+++ b/src/app/calculators/rugofondmultiple/en.json
@@ -22,12 +22,5 @@
     "d65": "d65",
 
     "PASSTYPE_0": "Horizontal aprons",
-    "PASSTYPE_1": "Inclined apron",
-
-    "UNIT_Q": "m³/s",
-    "UNIT_KS": "SI",
-    "UNIT_VDEB": "m/s",
-    "UNIT_YN": "m",
-    "UNIT_LINCL": "m/m"
-
+    "PASSTYPE_1": "Inclined apron"
 }
\ No newline at end of file
diff --git a/src/app/calculators/rugofondmultiple/fr.json b/src/app/calculators/rugofondmultiple/fr.json
index 212850ae1..6a2ab4707 100644
--- a/src/app/calculators/rugofondmultiple/fr.json
+++ b/src/app/calculators/rugofondmultiple/fr.json
@@ -22,11 +22,5 @@
     "d65": "d65",
     
     "PASSTYPE_0": "Radier horizontal",
-    "PASSTYPE_1": "Radier incliné",
-
-    "UNIT_Q": "m³/s",
-    "UNIT_KS": "SI",
-    "UNIT_VDEB": "m/s",
-    "UNIT_YN": "m",
-    "UNIT_LINCL": "m/m"
+    "PASSTYPE_1": "Radier incliné"
 }
\ No newline at end of file
-- 
GitLab


From fd0b6a3caec0f4963aa75406eeaf9a0903172710 Mon Sep 17 00:00:00 2001
From: Jean-Pascal Aubry <jean-pascal.aubry@inrae.fr>
Date: Wed, 26 Jun 2024 08:59:25 +0000
Subject: [PATCH 11/12] fix: remove unit keys translation in cloisons config
 Refs #676

---
 src/app/calculators/cloisons/en.json | 9 +--------
 src/app/calculators/cloisons/fr.json | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/app/calculators/cloisons/en.json b/src/app/calculators/cloisons/en.json
index 16d63c646..0ea3a154c 100644
--- a/src/app/calculators/cloisons/en.json
+++ b/src/app/calculators/cloisons/en.json
@@ -1,12 +1,5 @@
 {
     "Q": "Total discharge",
     "P": "Sill",
-    "W": "Gate opening",
-
-	"UNIT_Q": "m³/s",
-    "UNIT_YMOY": "m",
-    "UNIT_ZDV": "m",
-    "UNIT_P": "m",
-    "UNIT_H2": "m",
-    "UNIT_SUBMERGENCE": "%"
+    "W": "Gate opening"
 }
\ No newline at end of file
diff --git a/src/app/calculators/cloisons/fr.json b/src/app/calculators/cloisons/fr.json
index 8bbc3d0d0..f192e3561 100644
--- a/src/app/calculators/cloisons/fr.json
+++ b/src/app/calculators/cloisons/fr.json
@@ -1,12 +1,5 @@
 {
     "Q": "Débit total",
     "P": "Pelle",
-    "W": "Ouverture de vanne",
-
-	"UNIT_Q": "m³/s",
-    "UNIT_YMOY": "m",
-    "UNIT_ZDV": "m",
-    "UNIT_P": "m",
-    "UNIT_H2": "m",
-    "UNIT_SUBMERGENCE": "%"
+    "W": "Ouverture de vanne"
 }
\ No newline at end of file
-- 
GitLab


From 76355e37d7663e7503ff51e83528e8e3356c5039 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Fri, 19 Jul 2024 10:03:58 +0200
Subject: [PATCH 12/12] Update jalhyd_branch

---
 jalhyd_branch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jalhyd_branch b/jalhyd_branch
index cd7e102f5..35ca24e72 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-374-solveur-les-select-d-une-session-chargee-ne-s-initialise-pas
+379-rugofond-ajouter-un-avertissement-sur-les-lignes-d-eau-trop-elevees
-- 
GitLab