Merge branch 'dev' into minor-works

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>
 

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>

src/app/pages/dates/dates.component.html

@@ -1,5 +1,5 @@
 <div i18n>
-    Config spécialement pour les dates
+    {{"dates.title"|translate}}
 </div>
 
 <div>
@@ -12,8 +12,8 @@
 			id="multi_hours"
 			[(ngModel)]="config.allowSeveralHours"
 		>
-			<option value="true">possiblement différents</option>
+			<option value="true">{{"dates.multiple.different"|translate}}</option>
-			<option value="false">identiques</option>
+			<option value="false">{{"dates.multiple.identical"|translate}}</option>
 		</select>
 		<span i18n>
 			pour chaque journée
@@ -26,13 +26,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
+        {{"dates.count_dates"|translate}}
-	</span>
+    </span>
 
     <div
         *ngFor="let choice of config.dateList; index as id"

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>{{"resume.admins"|translate}}</h2>
-<h2 i18n>Coté sondés</h2>
+<h2 i18n>{{"resume.users"|translate}}</h2>
-<h2 i18n>recevoir les liens par e-mail</h2>
+<h2 i18n>{{"resume.link_mail"|translate}}</h2>

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>

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>
+</nav>

src/assets/i18n/en.json

@@ -11,7 +11,7 @@
         "perfect": "That's perfect",
         "title": "Create a poll",
         "letsgo": "Lets go!",
-        "description": "Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des liens… un sondage quoi !",
+        "description": "Shedule appointments with your friends or your family, or create a pool with text, pictures or links… A real survey!",
         "find_my_polls": "Where are my polls ?",
         "find_helper": "I am looking for polls linked to my email",
         "find_button": "Find my polls"
@@ -31,34 +31,34 @@
         "description_placeholder": "summary of the poll's purpose"
     },
     "dates": {
-        "title": "Config spécialement pour les dates ",
+        "title": "Config especially for the dates",
-        "hours_different": "Je souhaite mettre des créneaux horaires pour chaque journée",
+        "hours_different": "I want to put slots for each day",
         "multiple": {
-            "identical": "identiques",
+            "identical": "same",
-            "different": "possiblement différentes"
+            "different": "possibly different"
         },
-        "add": "Ajouter une plage de dates",
+        "add": "Add a date range",
-        "count_dates": "choix de dates"
+        "count_dates": "choices of dates"
     },
     "choices": {
-        "title": "Choisir les propositions",
+        "title": "Write the proposals",
-        "helper": "vous pouvez utiliser la syntaxe markdown ",
+        "helper": "You can use markdown syntax",
-        "answer_preset_1": "réponse de démo 1",
+        "answer_preset_1": "Demo answer 1",
-        "answer_preset_2": "réponse 2",
+        "answer_preset_2": "answer 2",
-        "answer_preset_3": "la réponse D",
+        "answer_preset_3": "and D, the answer D",
-        "add": "Ajouter",
+        "add": "Add",
-        "continue": "Voyons ce que ça donne"
+        "continue": "Let's see how it goes"
     },
     "resume": {
-        "title": "Et c'est tout pour nous!",
+        "title": "And that's all for us!",
-        "admins": "Coté administrateur-ice-eux",
+        "admins": "Admin side",
-        "users": "Coté sondés",
+        "users": "Respondent side",
-        "links_mail": "recevoir les liens par e-mail"
+        "links_mail": "Receive links by email"
     },
     "visibility": {
-        "title": "Visibilité des réponses",
+        "title": "Visibility of answers",
         "votes": "Votes",
-        "archiving": "Archivage",
+        "archiving": "Archiving",
-        "access": "Accès au sondage"
+        "access": "Access to the pool"
     }
 }

src/assets/scss/molecules/_logo.scss

@@ -1,3 +1,8 @@
+.logo_first, .logo_second {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 .logo_first {
   color: $logo_color;
 }