Skip to content
Snippets Groups Projects
Commit ec4e211c authored by francois.grand's avatar francois.grand
Browse files

- Lechapt-Calmon : ajout des traductions des paramètres L,M,N

- CalculatorResultsComponent : correction des cas où on affichait L:L, M:M, N:N
parent f329470e
No related branches found
No related tags found
No related merge requests found
......@@ -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",
......
......@@ -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",
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment