From 3e1689bb98d27948eee027a44847f895b46b7cb9 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 18 Dec 2019 10:41:44 +0100
Subject: [PATCH] Update translations for MacroRugo width-related warnings;
switch position of ZRL/ZRR fields in MRC GUI
---
.../macrorugo-compound/macrorugo-compound.config.json | 2 +-
src/locale/messages.en.json | 4 ++--
src/locale/messages.fr.json | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/calculators/macrorugo-compound/macrorugo-compound.config.json b/src/app/calculators/macrorugo-compound/macrorugo-compound.config.json
index c1051293a..5ecdf13e0 100644
--- a/src/app/calculators/macrorugo-compound/macrorugo-compound.config.json
+++ b/src/app/calculators/macrorugo-compound/macrorugo-compound.config.json
@@ -37,8 +37,8 @@
"type": "select",
"source": "mrc_pass_type"
},
- "ZRL",
"ZRR",
+ "ZRL",
"BR"
]
},
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index f4bf114b2..1e4480cb9 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -500,8 +500,8 @@
"WARNING_UPSTREAM_BOTTOM_HIGHER_THAN_WATER": "Upstream water elevation is lower or equal to bottom elevation",
"WARNING_DOWNSTREAM_BOTTOM_HIGHER_THAN_WATER": "Downstream water elevation is lower or equal to bottom elevation",
"WARNING_NEGATIVE_SILL": "Sill should be positive",
- "WARNING_RAMP_WIDTH_LOWER_THAN_PATTERN_WIDTH": "Ramp width should contain at least one block",
- "WARNING_RAMP_WIDTH_NOT_MULTIPLE_OF_HALF_PATTERN_WIDTH": "Ramp width should be a multiple of half the block width %halfPattern%m. Nearest values are %lower% and %higher%",
+ "WARNING_RAMP_WIDTH_LOWER_THAN_PATTERN_WIDTH": "Ramp width should contain at least one block (%pattern%m)",
+ "WARNING_RAMP_WIDTH_NOT_MULTIPLE_OF_HALF_PATTERN_WIDTH": "Ramp width should be a multiple of half the block width (%halfPattern%m). Nearest values are %lower% and %higher%",
"WARNING_YN_SECTION_PENTE_NEG_NULLE_HNORMALE_INF": "Normal depth: slope is negative or zero, normal depth is infinite",
"WARNING_YN_SECTION_NON_CONVERGENCE_NEWTON_HNORMALE": "Normal depth: non convergence of the calculation (Newton's method)",
"WARNING_SECTION_OVERFLOW": "Overflow: water elevation exceeds embankment elevation",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 79f9d0f0f..42ab64ad7 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -499,8 +499,8 @@
"WARNING_UPSTREAM_BOTTOM_HIGHER_THAN_WATER": "La cote de l'eau à l'amont est plus basse ou égale à la cote de fond",
"WARNING_DOWNSTREAM_BOTTOM_HIGHER_THAN_WATER": "La cote de l'eau à l'aval est plus basse ou égale à la cote de fond",
"WARNING_NEGATIVE_SILL": "La pelle du seuil devrait être positive",
- "WARNING_RAMP_WIDTH_LOWER_THAN_PATTERN_WIDTH": "La largeur de la rampe devrait comprendre au moins un motif de plot",
- "WARNING_RAMP_WIDTH_NOT_MULTIPLE_OF_HALF_PATTERN_WIDTH": "La largeur de la rampe devrait être un multiple d'un demi motif %halfPattern%m. Les valeurs voisines sont %lower% et %higher%",
+ "WARNING_RAMP_WIDTH_LOWER_THAN_PATTERN_WIDTH": "La largeur de la rampe devrait comprendre au moins un motif de plot (%pattern%m)",
+ "WARNING_RAMP_WIDTH_NOT_MULTIPLE_OF_HALF_PATTERN_WIDTH": "La largeur de la rampe devrait être un multiple d'un demi motif (%halfPattern%m). Les valeurs voisines sont %lower% et %higher%",
"WARNING_YN_SECTION_PENTE_NEG_NULLE_HNORMALE_INF": "Hauteur normale: pente négative ou nulle, hauteur normale infinie",
"WARNING_YN_SECTION_NON_CONVERGENCE_NEWTON_HNORMALE": "Hauteur normale: non convergence du calcul (méthode de Newton)",
"WARNING_SECTION_OVERFLOW": "Débordement: la cote de l'eau dépasse la cote de berge",
--
GitLab