From 5431b16a8f6f93795840c4b30b5cf722b8e92184 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Wed, 12 Jun 2019 12:41:56 +0200
Subject: [PATCH] cassiopee/jalhyd#100 Cloisons : Remplacement de ZDV par h1
---
src/app/calculators/cloisons/cloisons.config.json | 2 +-
src/app/calculators/cloisons/cloisons.en.json | 1 +
src/app/calculators/cloisons/cloisons.fr.json | 1 +
src/locale/messages.en.json | 3 ++-
src/locale/messages.fr.json | 3 ++-
5 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/app/calculators/cloisons/cloisons.config.json b/src/app/calculators/cloisons/cloisons.config.json
index 6ce6b17ba..29284a5a3 100644
--- a/src/app/calculators/cloisons/cloisons.config.json
+++ b/src/app/calculators/cloisons/cloisons.config.json
@@ -143,7 +143,7 @@
},
{
"type": "input",
- "id": "ZDV",
+ "id": "h1",
"unit": "m",
"nodeType": "StructureRectangle",
"dep_exist": [
diff --git a/src/app/calculators/cloisons/cloisons.en.json b/src/app/calculators/cloisons/cloisons.en.json
index c60b60eae..681065b65 100644
--- a/src/app/calculators/cloisons/cloisons.en.json
+++ b/src/app/calculators/cloisons/cloisons.en.json
@@ -5,6 +5,7 @@
"BB": "Largeur du bassin",
"PB": "Profondeur moyenne du bassin",
"DH": "Chute",
+ "h1": "Head",
"S": "Surface de l'orifice",
"ZRAM": "Bottom elevation",
"alpha2": "Demi-angle au sommet (°)",
diff --git a/src/app/calculators/cloisons/cloisons.fr.json b/src/app/calculators/cloisons/cloisons.fr.json
index fc6e0d91e..43a188d68 100644
--- a/src/app/calculators/cloisons/cloisons.fr.json
+++ b/src/app/calculators/cloisons/cloisons.fr.json
@@ -5,6 +5,7 @@
"BB": "Largeur du bassin",
"PB": "Profondeur moyenne du bassin",
"DH": "Chute",
+ "h1": "Charge",
"S": "Surface de l'orifice",
"ZRAM": "Cote de radier amont de la cloison",
"alpha2": "Demi-angle au sommet (°)",
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 4bdcf9c59..966ed52a8 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -133,6 +133,7 @@
"INFO_LIB_OUVRAGE_Q_MODE": "Mode",
"INFO_LIB_OUVRAGE_Q_REGIME": "Regime",
"INFO_LIB_OUVRAGE_Q": "Discharge",
+ "INFO_LIB_OUVRAGE_ZDV": "Sill elevation",
"INFO_LIB_P": "Wetted perimeter",
"INFO_LIB_PR": "Display accuracy",
"INFO_LIB_PV": "Volumic dissipated power",
@@ -168,7 +169,7 @@
"INFO_LIB_ZDV": "Crest weir elevation or gate base",
"INFO_LIB_ZF2": "Downstream bottom elevation",
"INFO_LIB_ZRAM": "Upstream apron elevation",
- "INFO_LIB_ZRB": "Downstream basin bottom elevation",
+ "INFO_LIB_ZRMB": "Downstream basin bottom elevation",
"INFO_LIB_ZT": "Triangle top elevation",
"INFO_LINKED_VALUE_DEVICE_RESULT": "%s (%s, device %s)",
"INFO_LINKED_VALUE_DEVICE": "%s (%s, device %s)",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index a0eda8f5f..8c6f7c1d8 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -133,6 +133,7 @@
"INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWMODE": "Type d'écoulement",
"INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWREGIME": "Régime",
"INFO_LIB_OUVRAGE_Q": "Débit",
+ "INFO_LIB_OUVRAGE_ZDV": "Cote du seuil",
"INFO_LIB_P": "Périmètre mouillé",
"INFO_LIB_PR": "Précision de calcul",
"INFO_LIB_PV": "Puissance volumique dissipée",
@@ -168,7 +169,7 @@
"INFO_LIB_ZDV": "Cote de la crête du déversoir ou du radier de la vanne",
"INFO_LIB_ZF2": "Cote de fond aval",
"INFO_LIB_ZRAM": "Cote du radier amont",
- "INFO_LIB_ZRB": "Cote de radier du bassin aval",
+ "INFO_LIB_ZRMB": "Cote de radier du bassin aval",
"INFO_LIB_ZT": "Cote haute du triangle",
"INFO_LINKED_VALUE_DEVICE_RESULT": "%s (%s, ouvrage %s)",
"INFO_LINKED_VALUE_DEVICE": "%s (%s, ouvrage %s)",
--
GitLab