From 0cb0813eb774c7aff4f96d71822dfa2d9e0cd089 Mon Sep 17 00:00:00 2001
From: Come_744 <numero_744@net-c.com>
Date: Sat, 5 Oct 2019 19:40:48 +0200
Subject: [PATCH 1/2] Add i18n in navigation

---
 .../ui/navigation/navigation.component.html   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/ui/navigation/navigation.component.html b/src/app/ui/navigation/navigation.component.html
index c234b935..c7fa566b 100644
--- a/src/app/ui/navigation/navigation.component.html
+++ b/src/app/ui/navigation/navigation.component.html
@@ -1,29 +1,29 @@
 <nav class="choices">
-	<a [routerLink]="'/step/creation'">
+	<a [routerLink]="'/step/creation'" i18n>
 		Création
 	</a>
-	<a [routerLink]="'/step/date'">
+	<a [routerLink]="'/step/date'" i18n>
 		Les Dates
 	</a>
-	<a [routerLink]="'/step/answers'">
+	<a [routerLink]="'/step/answers'" i18>
 		Réponses
 	</a>
-	<a [routerLink]="'/step/visibility'">
+	<a [routerLink]="'/step/visibility'" i18n>
 		Visibilité
 	</a>
-	<a [routerLink]="'/step/base'">
+	<a [routerLink]="'/step/base'" i18n>
 		Base
 	</a>
-	<a [routerLink]="'/step/pictures'">
+	<a [routerLink]="'/step/pictures'" i18n>
 		Images
 	</a>
-	<a [routerLink]="'/step/resume'">
+	<a [routerLink]="'/step/resume'" i18n>
 		Résumé
 	</a>
-	<a [routerLink]="'/step/kind'">
+	<a [routerLink]="'/step/kind'" i18n>
 		Page démo
 	</a>
-	<a [routerLink]="'/home'">
+	<a [routerLink]="'/home'" i18n>
 		Accueil
 	</a>
-</nav>
\ No newline at end of file
+</nav>

From c5021a2aa1ff176457852f5419aa76e58dff2fa6 Mon Sep 17 00:00:00 2001
From: Come_744 <numero_744@net-c.com>
Date: Mon, 7 Oct 2019 22:02:22 +0200
Subject: [PATCH 2/2] Replaced text by i18n json keys and add i18n attribute

Texts have been replaced only when the keys were in the json files.

i18n attributes have been added only when keys were not in the json files.
---
 src/app/app.component.html                           |  4 ++--
 src/app/pages/answers/answers.component.html         |  5 +++--
 src/app/pages/dates/dates.component.html             | 12 ++++++------
 .../end-confirmation/end-confirmation.component.html |  8 ++++----
 src/app/pages/visibility/visibility.component.html   |  8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index fba0c0fa..8bc75096 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -11,9 +11,9 @@
             <button class="btn btn-info" (click)="switchLanguage('en')">en</button>
             <button class="btn btn-info" (click)="switchLanguage('fr')">fr</button>
         </div>
-        <h1 translate>Title</h1>
+	<h1 i18n>{{"Title"|translate}}</h1>
         <div>
-            {{ 'Intro' | translate:user }}
+            {{"Intro"|translate:user}}
         </div>
     </div>
 
diff --git a/src/app/pages/answers/answers.component.html b/src/app/pages/answers/answers.component.html
index c1193151..76f80a36 100644
--- a/src/app/pages/answers/answers.component.html
+++ b/src/app/pages/answers/answers.component.html
@@ -22,9 +22,10 @@
 
     <button
         (click)="addAnswer()"
-        class="btn-outline btn-block">
+        class="btn-outline btn-block"
+        i18n>
         Ajouter
     </button>
 
-    <a [routerLink]="'/step/resume'" class="btn btn-block">Voyons ce que ça donne</a>
+    <a [routerLink]="'/step/resume'" class="btn btn-block" i18n>Voyons ce que ça donne</a>
 </div>
diff --git a/src/app/pages/dates/dates.component.html b/src/app/pages/dates/dates.component.html
index 6670e93d..88b6e0fa 100644
--- a/src/app/pages/dates/dates.component.html
+++ b/src/app/pages/dates/dates.component.html
@@ -1,5 +1,5 @@
 <div i18n>
-    Config spécialement pour les dates
+    {{"dates.title"|translate}}
 </div>
 
 <div>
@@ -8,8 +8,8 @@
         id="multi_hours"
         [(ngModel)]="config.allowSeveralHours"
     >
-        <option value="true">possiblement différents</option>
-        <option value="false">identiques</option>
+        <option value="true">{{"dates.multiple.different"|translate}}</option>
+        <option value="false">{{"dates.multiple.identical"|translate}}</option>
     </select>
 
     <label for="multi_hours">
@@ -28,13 +28,13 @@
     (click)="addDate()"
     i18n
 >
-    Ajouter une plage de dates
+    {{"dates.add"|translate}}
 </button>
 <div class="dates-list">
     {{config.dateList.length}}
     <span i18n>
-		choix de Dates
-	</span>
+        {{"dates.count_dates"|translate}}
+    </span>
 
     <div
         *ngFor="let choice of config.dateList; index as id"
diff --git a/src/app/pages/end-confirmation/end-confirmation.component.html b/src/app/pages/end-confirmation/end-confirmation.component.html
index cbeed8ca..4a354428 100644
--- a/src/app/pages/end-confirmation/end-confirmation.component.html
+++ b/src/app/pages/end-confirmation/end-confirmation.component.html
@@ -1,6 +1,6 @@
 <h1 i18n>
-    Et c'est tout pour nous!
+    {{"resume.title"|translate}}
 </h1>
-<h2 i18n>Coté administrateur-ice-eux</h2>
-<h2 i18n>Coté sondés</h2>
-<h2 i18n>recevoir les liens par e-mail</h2>
+<h2 i18n>{{"resume.admins"|translate}}</h2>
+<h2 i18n>{{"resume.users"|translate}}</h2>
+<h2 i18n>{{"resume.link_mail"|translate}}</h2>
diff --git a/src/app/pages/visibility/visibility.component.html b/src/app/pages/visibility/visibility.component.html
index 43317d13..a77d5250 100644
--- a/src/app/pages/visibility/visibility.component.html
+++ b/src/app/pages/visibility/visibility.component.html
@@ -1,14 +1,14 @@
 <h1 i18n>
-    Visibilité des réponses
+    {{"visibility.title"|translate}}
 </h1>
 <h1 i18n>
-    Votes
+    {{"visibility.votes"|translate}}
 </h1>
 <h1 i18n>
-    Archivage
+    {{"visibility.archiving"|translate}}
 </h1>
 
 <h1 i18n>
-    Accès au sondage
+    {{"visibility.access"|translate}}
 </h1>
 <a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">C'est parfait!</a>