From dbb801357e133e696be6a94e302db2f3bfa32569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois?= <francois.grand@irstea.fr>
Date: Thu, 25 Jan 2018 07:32:05 +0100
Subject: [PATCH] =?UTF-8?q?ticket=20#51=20:=20internationalisation=20du=20?=
 =?UTF-8?q?nom=20de=20calculette=20par=20d=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/formulaire/formulaire-definition.ts       | 1 -
 src/app/services/formulaire/formulaire.service.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/formulaire/formulaire-definition.ts b/src/app/formulaire/formulaire-definition.ts
index 05780b2e1..4f1ebfc4c 100644
--- a/src/app/formulaire/formulaire-definition.ts
+++ b/src/app/formulaire/formulaire-definition.ts
@@ -94,7 +94,6 @@ export class FormulaireDefinition extends Observable {
         this._fixVarResults = new FixedVarResults();
         this._sectionResults = new SectionResults();
         this._remousResults = new RemousResults();
-        this._calculatorName = CalculatorType[this._calcType] + " (" + this.uid + ")";
     }
 
     public get calculatorType(): CalculatorType {
diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts
index 00c783d6d..54323a114 100644
--- a/src/app/services/formulaire/formulaire.service.ts
+++ b/src/app/services/formulaire/formulaire.service.ts
@@ -123,6 +123,7 @@ export class FormulaireService extends Observable {
             throw "FormulaireService.createFormulaire() : invalid undefined CalculatorType"
 
         let f = new FormulaireDefinition(ct, this.paramService, this.intlService, this.appSetupService);
+        f.calculatorName = this.getLocalisedTitleFromCalculatorType(ct) + " (" + f.uid + ")";
         this._formulaires.push(f);
         let prom: Promise<Response> = this.loadConfig(f, ct);
         return prom.then(_ => {
-- 
GitLab