From 0c1e32a970e13ab16f598ff26cecea1eb2787c69 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Wed, 22 Nov 2023 13:47:54 +0000
Subject: [PATCH] fix: remove ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF message
 Refs  #353

---
 jalhyd_branch               | 2 +-
 src/locale/messages.en.json | 1 -
 src/locale/messages.fr.json | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/jalhyd_branch b/jalhyd_branch
index 1f7391f92..2d3bfbef7 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-master
+353-prebarrage-autoriser-les-cotes-de-seuil-inferieures-a-la-cote-de-fond-du-bassin-amont
\ No newline at end of file
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 36d1cc3d7..c8fd7869c 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -58,7 +58,6 @@
     "ERROR_PARAMDOMAIN_INTERVAL_BOUNDS": "invalid %minValue%/%maxValue% min/max boundaries for 'interval' parameter definition domain",
     "ERROR_PARAMDOMAIN_INVALID": "parameter '%symbol%: non supported '%domain%' definition domain",
     "WARNING_PREBARRAGE_NON_CONVERGENCE": "Pre-dam: calculation converged with a water elevation precision of %precision%&nbsp;m",
-    "ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF": "Apron elevation of device #%ns% is lower than bottom elevation of upstream basin of wall %cub%-%cdb%",
     "ERROR_PREBARRAGE_Z2_SUP_Z1": "Downstream water elevation is greater than upstream water elevation",
     "ERROR_PROBLEM_LOADING_SESSION": "Session loaded, with errors",
     "ERROR_REMOUS_NO_WATER_LINE": "No water line can be calculated",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 7886efb3d..05ac13aef 100755
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -58,7 +58,6 @@
     "ERROR_PARAMDOMAIN_INTERVAL_BOUNDS": "Les bornes (%minValue%/%maxValue%) de l'intervalle sont incorrectes",
     "ERROR_PARAMDOMAIN_INVALID": "Paramètre '%symbol%'&nbsp;: le domaine de définition '%domain%' est incorrect",
     "WARNING_PREBARRAGE_NON_CONVERGENCE": "Pré-barrage&nbsp;: le calcul a convergé avec une précision des cotes de %precision%&nbsp;m",
-    "ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF": "Cote de radier de l'ouvrage n°%ns% inférieure à la cote de fond du bassin amont de la cloison %cub%-%cdb%",
     "ERROR_PREBARRAGE_Z2_SUP_Z1": "Cote de l'eau aval supérieure à la cote de l'eau amont",
     "ERROR_PROBLEM_LOADING_SESSION": "Session chargée, avec des erreurs",
     "ERROR_REMOUS_NO_WATER_LINE": "Aucune ligne d'eau ne peut être calculée",
-- 
GitLab