From 69bd752b391fb66f907fa8b03067a10fd3bcd946 Mon Sep 17 00:00:00 2001 From: Mathias Chouet <mathias.chouet@irstea.fr> Date: Thu, 23 Apr 2020 16:48:12 +0200 Subject: [PATCH] Fix #393 - rename Triangular weir flow to (Villemonte) --- src/app/calculators/dever/en.json | 4 ++-- src/app/calculators/dever/fr.json | 4 ++-- src/locale/messages.en.json | 4 ++-- src/locale/messages.fr.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/calculators/dever/en.json b/src/app/calculators/dever/en.json index 560163699..3f6315e25 100644 --- a/src/app/calculators/dever/en.json +++ b/src/app/calculators/dever/en.json @@ -10,8 +10,8 @@ "select_structure_SeuilTriangulaireTrunc": "Truncated triangular weir", "select_loidebit_SeuilRectangulaire_WeirFree": "Free flow rectangular weir", - "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Free flow triangular weir", - "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Free flow truncated triangular weir", + "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Triangular weir (Villemonte)", + "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)", "UNIT_Q": "m³/s", "UNIT_EC": "m", diff --git a/src/app/calculators/dever/fr.json b/src/app/calculators/dever/fr.json index 12b057dc3..a550e3b5e 100644 --- a/src/app/calculators/dever/fr.json +++ b/src/app/calculators/dever/fr.json @@ -10,8 +10,8 @@ "select_structure_SeuilTriangulaireTrunc": "Déversoir triangulaire tronqué", "select_loidebit_SeuilRectangulaire_WeirFree": "Déversoir rectangulaire dénoyé", - "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire dénoyé", - "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué dénoyé", + "select_loidebit_SeuilTriangulaire_TriangularWeirFree": "Déversoir triangulaire (Villemonte)", + "select_loidebit_SeuilTriangulaireTrunc_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)", "UNIT_Q": "m³/s", "UNIT_EC": "m", diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index e133d5c21..d9dfb30f4 100644 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -305,8 +305,8 @@ "INFO_LOIDEBIT_WeirSubmergedLarinier": "Submerged slot (Larinier 1992)", "INFO_LOIDEBIT_OrificeSubmerged": "Submerged orifice", "INFO_LOIDEBIT_OrificeFree": "Free orifice", - "INFO_LOIDEBIT_TriangularWeirFree": "Free flow triangular weir", - "INFO_LOIDEBIT_TriangularTruncWeirFree": "Free flow truncated triangular weir", + "INFO_LOIDEBIT_TriangularWeirFree": "Triangular weir (Villemonte)", + "INFO_LOIDEBIT_TriangularTruncWeirFree": "Truncated triangular weir (Villemonte)", "INFO_LOIDEBIT_GateCem88d": "Weir/Orifice Cemagref 88", "INFO_LOIDEBIT_GateCem88v": "Weir/Undershot gate Cemagref 88", "INFO_LOIDEBIT_WeirCem88d": "Weir/Orifice Cemagref 88", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index e846222d0..27fee0342 100644 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -304,8 +304,8 @@ "INFO_LOIDEBIT_WeirSubmergedLarinier": "Fente noyée (Larinier 1992)", "INFO_LOIDEBIT_OrificeSubmerged": "Orifice noyé", "INFO_LOIDEBIT_OrificeFree": "Orifice dénoyé", - "INFO_LOIDEBIT_TriangularWeirFree": "Déversoir triangulaire dénoyé", - "INFO_LOIDEBIT_TriangularTruncWeirFree": "Déversoir triangulaire tronqué dénoyé", + "INFO_LOIDEBIT_TriangularWeirFree": "Déversoir triangulaire (Villemonte)", + "INFO_LOIDEBIT_TriangularTruncWeirFree": "Déversoir triangulaire tronqué (Villemonte)", "INFO_LOIDEBIT_GateCem88d": "Déversoir/Orifice Cemagref 88", "INFO_LOIDEBIT_GateCem88v": "Déversoir/Vanne de fond Cemagref 88", "INFO_LOIDEBIT_WeirCem88d": "Déversoir/Orifice Cemagref 88", -- GitLab