From ec4e211c5263e87901844da7b8e86718b9f71ca6 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Thu, 30 Nov 2017 17:10:26 +0100
Subject: [PATCH] =?UTF-8?q?-=20Lechapt-Calmon=20:=20ajout=20des=20traducti?=
=?UTF-8?q?ons=20des=20param=C3=A8tres=20L,M,N=20-=20CalculatorResultsComp?=
=?UTF-8?q?onent=20:=20correction=20des=20cas=20o=C3=B9=20on=20affichait?=
=?UTF-8?q?=20L:L,=20M:M,=20N:N?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../calculators/lechapt-calmon/lechapt-calmon.en.json | 3 +++
.../calculators/lechapt-calmon/lechapt-calmon.fr.json | 3 +++
.../calculator-results.component.ts | 11 ++++++-----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
index 983b39412..47b3a9b00 100644
--- a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
+++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
@@ -10,6 +10,9 @@
"select_material_7": "PVC - Polyethylene",
"select_material_8": "Hydraulically smooth pipe - 0.05 ≤ D ≤ 0.2",
"select_material_9": "Hydraulically smooth pipe - 0.25 ≤ D ≤ 1",
+ "L": "L",
+ "M": "M",
+ "N": "N",
"fs_hydraulique": "Hydraulic features",
"Q": "Flow",
"D": "Pipe diameter",
diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
index 81976f36a..f3b6465da 100644
--- a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
+++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
@@ -10,6 +10,9 @@
"select_material_7": "PVC - Polyéthylène",
"select_material_8": "Tuyau hydrauliquement lisse - 0.05 ≤ D ≤ 0.2",
"select_material_9": "Tuyau hydrauliquement lisse - 0.25 ≤ D ≤ 1",
+ "L": "L",
+ "M": "M",
+ "N": "N",
"fs_hydraulique": "Caractéristiques hydrauliques",
"Q": "Débit",
"D": "Diamètre du tuyau",
diff --git a/src/app/components/calculator-results/calculator-results.component.ts b/src/app/components/calculator-results/calculator-results.component.ts
index 64e5ff755..70c923d70 100644
--- a/src/app/components/calculator-results/calculator-results.component.ts
+++ b/src/app/components/calculator-results/calculator-results.component.ts
@@ -156,11 +156,12 @@ export class CalculatorResultsComponent {
let res = "";
if (displaySymbol)
res += p.symbol;
- if (p.label != undefined && p.label != "") {
- if (res.length > 0)
- res += ":";
- res += p.label;
- }
+ if (p.label != undefined && p.label != "")
+ if (p.symbol != p.label || !displaySymbol) {
+ if (res.length > 0)
+ res += ":";
+ res += p.label;
+ }
if (p.unit != undefined && p.unit != "")
res += " (" + p.unit + ")";
return res;
--
GitLab