From 8e922577efa210142eeaf9bb7837fb22e5365202 Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Fri, 15 May 2020 13:30:11 +0200
Subject: [PATCH] Fix #405 - variable descriptions in PAR
---
src/app/calculators/par/en.json | 14 +++++++-------
src/app/calculators/par/fr.json | 16 ++++++++--------
src/app/calculators/parsimulation/en.json | 14 +++++++-------
src/app/calculators/parsimulation/fr.json | 16 ++++++++--------
src/locale/messages.en.json | 4 ++--
src/locale/messages.fr.json | 4 ++--
6 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/app/calculators/par/en.json b/src/app/calculators/par/en.json
index 112496a3e..6274ab345 100644
--- a/src/app/calculators/par/en.json
+++ b/src/app/calculators/par/en.json
@@ -10,8 +10,8 @@
"ZD1": "Upstream spilling elevation",
"S": "Slope",
"P": "Space between baffles",
- "L": "Pass width",
- "a": "Baffle / chevron height",
+ "L": "Total width of baffle / pattern (superactive)",
+ "a": "Height of the pattern / height and thickness of the chevron (chevrons)",
"N": "Number of patterns",
"M": "Number of longitudinal strips",
@@ -27,12 +27,12 @@
"LPI": "Pass length following the slope",
"LPH": "Pass length in horizontal projection",
"A": "A",
- "B": "B",
- "C": "C",
- "D": "D",
+ "B": "Internal width of the baffle / channel (chevrons)",
+ "C": "Height from the base of the baffle to the base of the triangle",
+ "D": "Height from the base of the baffle to its tipping point",
"H": "Baffle height",
- "Hmin": "Hmin",
- "Hmax": "Hmax",
+ "Hmin": "Minimal baffle height",
+ "Hmax": "Maximal baffle height",
"select_par_type": "Type de passe",
"select_par_type_0": "Plane baffles",
diff --git a/src/app/calculators/par/fr.json b/src/app/calculators/par/fr.json
index 2fc234d84..027b8097a 100644
--- a/src/app/calculators/par/fr.json
+++ b/src/app/calculators/par/fr.json
@@ -10,8 +10,8 @@
"ZD1": "Cote de déversement à l'amont",
"S": "Pente",
"P": "Espacement entre les ralentisseurs",
- "L": "Largeur de la passe",
- "a": "Hauteur des ralentisseurs / des chevrons",
+ "L": "Largeur totale du ralentisseur / du motif (suractifs)",
+ "a": "Hauteur du motif / hauteur et épaisseur du chevron (chevrons)",
"N": "Nombre de motifs",
"M": "Nombre de bandes longitudinales",
@@ -27,12 +27,12 @@
"LPI": "Longueur de la passe en suivant la pente",
"LPH": "Longueur de la passe en projection horizontale",
"A": "A",
- "B": "B",
- "C": "C",
- "D": "D",
- "H": "Hauteur d'un ralentisseur",
- "Hmin": "Hmin",
- "Hmax": "Hmax",
+ "B": "Largeur interne du ralentisseur / du chenal (chevrons)",
+ "C": "Hauteur de la base du ralentisseur jusqu’à la base du triangle",
+ "D": "Hauteur de la base du ralentisseur jusqu’à sa pointe déversante",
+ "H": "Hauteur du ralentisseur",
+ "Hmin": "Hauteur minimale du ralentisseur",
+ "Hmax": "Hauteur maximale du ralentisseur",
"select_par_type": "Type de passe",
"select_par_type_0": "Ralentisseurs plans",
diff --git a/src/app/calculators/parsimulation/en.json b/src/app/calculators/parsimulation/en.json
index 3ff2bc405..1872b2949 100644
--- a/src/app/calculators/parsimulation/en.json
+++ b/src/app/calculators/parsimulation/en.json
@@ -14,8 +14,8 @@
"S": "Slope",
"P": "Space between baffles",
"Nb": "Number of baffles",
- "L": "Pass width",
- "a": "Baffle / chevron height",
+ "L": "Total width of baffle / pattern (superactive)",
+ "a": "Height of the pattern / height and thickness of the chevron (chevrons)",
"N": "Number of patterns",
"M": "Number of longitudinal strips",
@@ -27,12 +27,12 @@
"LPI": "Pass length following the slope",
"LPH": "Pass length in horizontal projection",
"A": "A",
- "B": "B",
- "C": "C",
- "D": "D",
+ "B": "Internal width of the baffle / channel (chevrons)",
+ "C": "Height from the base of the baffle to the base of the triangle",
+ "D": "Height from the base of the baffle to its tipping point",
"H": "Baffle height",
- "Hmin": "Hmin",
- "Hmax": "Hmax",
+ "Hmin": "Minimal baffle height",
+ "Hmax": "Maximal baffle height",
"select_par_type": "Type de passe",
"select_par_type_0": "Plane baffles",
diff --git a/src/app/calculators/parsimulation/fr.json b/src/app/calculators/parsimulation/fr.json
index 5748df1e6..0b6c772b6 100644
--- a/src/app/calculators/parsimulation/fr.json
+++ b/src/app/calculators/parsimulation/fr.json
@@ -14,8 +14,8 @@
"S": "Pente",
"P": "Espacement entre les ralentisseurs",
"Nb": "Nombre de ralentisseurs",
- "L": "Largeur de la passe",
- "a": "Hauteur des ralentisseurs / des chevrons",
+ "L": "Largeur totale du ralentisseur / du motif (suractifs)",
+ "a": "Hauteur du motif / hauteur et épaisseur du chevron (chevrons)",
"N": "Nombre de motifs",
"M": "Nombre de bandes longitudinales",
@@ -27,12 +27,12 @@
"LPI": "Longueur de la passe en suivant la pente",
"LPH": "Longueur de la passe en projection horizontale",
"A": "A",
- "B": "B",
- "C": "C",
- "D": "D",
- "H": "Hauteur d'un ralentisseur",
- "Hmin": "Hmin",
- "Hmax": "Hmax",
+ "B": "Largeur interne du ralentisseur / du chenal (chevrons)",
+ "C": "Hauteur de la base du ralentisseur jusqu’à la base du triangle",
+ "D": "Hauteur de la base du ralentisseur jusqu’à sa pointe déversante",
+ "H": "Hauteur du ralentisseur",
+ "Hmin": "Hauteur minimale du ralentisseur",
+ "Hmax": "Hauteur maximale du ralentisseur",
"select_par_type": "Type de passe",
"select_par_type_0": "Ralentisseurs plans",
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index d951b42c1..5b27a9971 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -545,8 +545,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%",
- "WARNING_PAR_P_WAS_IGNORED": "Given P value was ignored",
- "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "Given P value is more than 10% lower or more than 5% greater than standard value %stdP%",
+ "WARNING_PAR_P_WAS_IGNORED": "Given spacing value was ignored",
+ "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": "qStar value %val% is outside of validity interval [ %min%, %max% ] given by abacuses",
"ERROR_PAR_HA_OUT_OF_RANGE": "ha value %val% is outside of validity interval [ %min%, %max% ] given by abacuses",
"WARNING_PAR_L": "A witdh greater than %max% is discouraged",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 00c6d54d8..e1cd5c833 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -546,8 +546,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%",
- "WARNING_PAR_P_WAS_IGNORED": "La valeur de P fournie a été ignorée",
- "ERROR_PAR_P_DEVIATES_MORE_THAN_10_5_PCT": "La valeur de P fournie est plus de 10% plus petite ou plus de 5% plus grande que la valeur standard %stdP%",
+ "WARNING_PAR_P_WAS_IGNORED": "La valeur d'espacement fournie a été ignorée",
+ "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% de qStar sort de l'intervalle de validité [ %min%, %max% ] donné par les abaques",
"ERROR_PAR_HA_OUT_OF_RANGE": "La valeur %val% de ha sort de l'intervalle de validité [ %min%, %max% ] donné par les abaques",
"WARNING_PAR_L": "Une largeur supérieure à %max% est déconseillée",
--
GitLab