From bcf37500bd52ba63fb6455604babd951c8946507 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 30 Jul 2020 11:19:09 +0200
Subject: [PATCH] PAR: typo; shorten "generate simulation" button
---
src/app/calculators/par/fr.json | 4 ----
src/app/calculators/parsimulation/fr.json | 4 ----
src/app/components/generic-calculator/calculator.component.ts | 2 +-
src/locale/messages.en.json | 2 +-
src/locale/messages.fr.json | 2 +-
5 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/app/calculators/par/fr.json b/src/app/calculators/par/fr.json
index 51e30503b..992593b5c 100644
--- a/src/app/calculators/par/fr.json
+++ b/src/app/calculators/par/fr.json
@@ -1,10 +1,6 @@
{
"fs_param_hydro": "Paramètres hydrauliques",
- "Q": "Débit",
- "Z1": "Cote de l'eau amont",
- "Z2": "Cote de leau aval",
-
"fs_geometry": "Géométrie de la passe",
"ha": "Charge amont",
diff --git a/src/app/calculators/parsimulation/fr.json b/src/app/calculators/parsimulation/fr.json
index 64d8f8e27..0c37ad399 100644
--- a/src/app/calculators/parsimulation/fr.json
+++ b/src/app/calculators/parsimulation/fr.json
@@ -1,10 +1,6 @@
{
"fs_param_hydro": "Paramètres hydrauliques",
- "Q": "Débit",
- "Z1": "Cote de l'eau amont",
- "Z2": "Cote de leau aval",
-
"fs_geometry": "Géométrie de la passe",
"ZD1": "Cote de déversement à l'amont",
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 832a817cb..0e35ac269 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -765,7 +765,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
/**
* Génère une liste de valeurs de tirant d'eau pour un couple Z1/ZF1 ou Z2/ZF2 donné
- * @param Z cote de leau (Z1 ou Z2)
+ * @param Z cote de l'eau (Z1 ou Z2)
* @param ZF cote de fond (ZF1 ou ZF2)
*/
private generateBiefYValuesForSP(Z: ParamDefinition, ZF: ParamDefinition): number | number[] {
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index f1e074a36..dffee5378 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -75,7 +75,7 @@
"INFO_CALCULATOR_PARAMFIXES": "Fixed parameters",
"INFO_CALCULATOR_RESULTS_GENERATE_PAB": "Generate a fish ladder",
"INFO_CALCULATOR_RESULTS_GENERATE_RU_SP": "Hydraulic details of section",
- "INFO_CALCULATOR_RESULTS_GENERATE_PAR_SIMULATION": "Generation a humpback fishway simulation",
+ "INFO_CALCULATOR_RESULTS_GENERATE_PAR_SIMULATION": "Generate a simulation",
"INFO_CALCULATOR_RESULTS_GENERATE_SP_AMONT": "Hydraulic details of upstream section",
"INFO_CALCULATOR_RESULTS_GENERATE_SP_AVAL": "Hydraulic details of downstream section",
"INFO_CALCULATOR_RESULTS_TITLE": "Results",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 8a0b3a263..2607a0115 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -75,7 +75,7 @@
"INFO_CALCULATOR_PARAMFIXES": "Paramètres fixés",
"INFO_CALCULATOR_RESULTS_GENERATE_PAB": "Générer une passe à bassins",
"INFO_CALCULATOR_RESULTS_GENERATE_RU_SP": "Détails hydrauliques de la section",
- "INFO_CALCULATOR_RESULTS_GENERATE_PAR_SIMULATION": "Générer une simulation de passe à ralentisseurs",
+ "INFO_CALCULATOR_RESULTS_GENERATE_PAR_SIMULATION": "Générer une simulation",
"INFO_CALCULATOR_RESULTS_GENERATE_SP_AMONT": "Détails hydrauliques de la section amont",
"INFO_CALCULATOR_RESULTS_GENERATE_SP_AVAL": "Détails hydrauliques de la section aval",
"INFO_CALCULATOR_RESULTS_TITLE": "Résultats",
--
GitLab