From af144b01d2f744e940193e1536694b51d0e61d67 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Wed, 25 Apr 2018 10:20:01 +0200
Subject: [PATCH] =?UTF-8?q?=20#77=20correction=20des=20unit=C3=A9s=20pour?=
=?UTF-8?q?=20la=20charge=20sp=C3=A9cifique,=20critique,=20etc...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/calculators/remous/remous.fr.json | 4 +--
src/locale/error_messages.en.json | 32 +++++++++++------------
src/locale/error_messages.fr.json | 32 +++++++++++------------
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/app/calculators/remous/remous.fr.json b/src/app/calculators/remous/remous.fr.json
index 5ba79bc63..b3086abb4 100644
--- a/src/app/calculators/remous/remous.fr.json
+++ b/src/app/calculators/remous/remous.fr.json
@@ -48,6 +48,6 @@
"select_target_Yco": "Le tirant d'eau conjugué (m)",
"select_target_J": "La perte de charge (m)",
"select_target_I-J": "Variation linéaire de l'énergie spécifique (m/m)",
- "select_target_Imp": "Impulsion (m/m)",
- "select_target_Tau0": "La force tractrice (N)"
+ "select_target_Imp": "Impulsion (N)",
+ "select_target_Tau0": "La force tractrice (Pa)"
}
\ No newline at end of file
diff --git a/src/locale/error_messages.en.json b/src/locale/error_messages.en.json
index 86f94a508..91b814d14 100644
--- a/src/locale/error_messages.en.json
+++ b/src/locale/error_messages.en.json
@@ -43,23 +43,23 @@
"INFO_LECHAPT_TITRE": "Lechapt-Calmon",
"INFO_REGUNI_TITRE": "Uniform flow calculation",
"INFO_SECTPARAM_TITRE": "Parametric section",
- "INFO_GRANDEUR_HS": "Specific head",
- "INFO_GRANDEUR_HSC": "Critical head",
- "INFO_GRANDEUR_B": "Surface width",
- "INFO_GRANDEUR_P": "Wetted perimeter",
- "INFO_GRANDEUR_S": "Wetted area",
- "INFO_GRANDEUR_R": "Hydraulic radius",
- "INFO_GRANDEUR_V": "Average speed",
+ "INFO_GRANDEUR_HS": "Specific head (m)",
+ "INFO_GRANDEUR_HSC": "Critical head (m)",
+ "INFO_GRANDEUR_B": "Surface width (m)",
+ "INFO_GRANDEUR_P": "Wetted perimeter (m)",
+ "INFO_GRANDEUR_S": "Wetted area (m2)",
+ "INFO_GRANDEUR_R": "Hydraulic radius (m)",
+ "INFO_GRANDEUR_V": "Average speed (m/s)",
"INFO_GRANDEUR_FR": "Froude number",
- "INFO_GRANDEUR_YC": "Critical depth",
- "INFO_GRANDEUR_YN": "Normal depth",
- "INFO_GRANDEUR_YF": "Subcritical depth",
- "INFO_GRANDEUR_YT": "Supercritical depth",
- "INFO_GRANDEUR_YCO": "Conjugate depth",
- "INFO_GRANDEUR_J": "Head loss",
- "INFO_GRANDEUR_I-J": "Linear variation of specific head",
- "INFO_GRANDEUR_IMP": "Impulse",
- "INFO_GRANDEUR_TAU0": "Tractive force",
+ "INFO_GRANDEUR_YC": "Critical depth (m)",
+ "INFO_GRANDEUR_YN": "Normal depth (m)",
+ "INFO_GRANDEUR_YF": "Subcritical depth (m)",
+ "INFO_GRANDEUR_YT": "Supercritical depth (m)",
+ "INFO_GRANDEUR_YCO": "Conjugate depth (m)",
+ "INFO_GRANDEUR_J": "Head loss (m)",
+ "INFO_GRANDEUR_I-J": "Linear variation of specific head (m/m)",
+ "INFO_GRANDEUR_IMP": "Impulse (N)",
+ "INFO_GRANDEUR_TAU0": "Tractive force (Pa)",
"INFO_REMOUS_TITRE": "Backwater curves",
"INFO_REMOUSRESULTS_TITREJOURNAL": "Calculation log",
"INFO_REMOUSRESULTS_LIGNEFLUVIALE": "Subcritical water profile",
diff --git a/src/locale/error_messages.fr.json b/src/locale/error_messages.fr.json
index f336ee9cf..cafedbd81 100644
--- a/src/locale/error_messages.fr.json
+++ b/src/locale/error_messages.fr.json
@@ -49,23 +49,23 @@
"INFO_LECHAPT_TITRE": "Lechapt-Calmon",
"INFO_REGUNI_TITRE": "Régime uniforme",
"INFO_SECTPARAM_TITRE": "Section paramétrée",
- "INFO_GRANDEUR_HS": "La charge spécifique",
- "INFO_GRANDEUR_HSC": "La charge critique",
- "INFO_GRANDEUR_B": "La largeur au miroir",
- "INFO_GRANDEUR_P": "Le périmètre mouillé",
- "INFO_GRANDEUR_S": "La surface mouillée",
- "INFO_GRANDEUR_R": "Le rayon hydraulique",
- "INFO_GRANDEUR_V": "La vitesse moyenne",
+ "INFO_GRANDEUR_HS": "La charge spécifique (m)",
+ "INFO_GRANDEUR_HSC": "La charge critique (m)",
+ "INFO_GRANDEUR_B": "La largeur au miroir (m)",
+ "INFO_GRANDEUR_P": "Le périmètre mouillé (m)",
+ "INFO_GRANDEUR_S": "La surface mouillée (m2)",
+ "INFO_GRANDEUR_R": "Le rayon hydraulique (m)",
+ "INFO_GRANDEUR_V": "La vitesse moyenne (m/s)",
"INFO_GRANDEUR_FR": "Le Froude",
- "INFO_GRANDEUR_YC": "Le tirant d'eau critique",
- "INFO_GRANDEUR_YN": "Le tirant d'eau normal",
- "INFO_GRANDEUR_YF": "Le tirant d'eau fluvial",
- "INFO_GRANDEUR_YT": "Le tirant d'eau torrentiel",
- "INFO_GRANDEUR_YCO": "Le tirant d'eau conjugué",
- "INFO_GRANDEUR_J": "La perte de charge",
- "INFO_GRANDEUR_I-J": "Variation linéaire de l'énergie spécifique",
- "INFO_GRANDEUR_IMP": "Impulsion",
- "INFO_GRANDEUR_TAU0": "La force tractrice",
+ "INFO_GRANDEUR_YC": "Le tirant d'eau critique (m)",
+ "INFO_GRANDEUR_YN": "Le tirant d'eau normal (m)",
+ "INFO_GRANDEUR_YF": "Le tirant d'eau fluvial (m)",
+ "INFO_GRANDEUR_YT": "Le tirant d'eau torrentiel (m)",
+ "INFO_GRANDEUR_YCO": "Le tirant d'eau conjugué (m)",
+ "INFO_GRANDEUR_J": "La perte de charge (m)",
+ "INFO_GRANDEUR_I-J": "Variation linéaire de l'énergie spécifique (m/m)",
+ "INFO_GRANDEUR_IMP": "Impulsion (N)",
+ "INFO_GRANDEUR_TAU0": "La force tractrice (Pa)",
"INFO_REMOUS_TITRE": "Courbes de remous",
"INFO_REMOUSRESULTS_TITREJOURNAL": "Journal de calcul",
"INFO_REMOUSRESULTS_LIGNEFLUVIALE": "Ligne d'eau fluviale",
--
GitLab