Merge branch 'internationalisation' into 'dev'

Internationalisation

See merge request framasoft/framadate/funky-framadate-front!5
This commit is contained in:
ty kayn 2019-10-14 13:17:23 +02:00
commit b0fbc167c1
6 changed files with 29 additions and 28 deletions

View File

@ -11,9 +11,9 @@
<button class="btn btn-info" (click)="switchLanguage('en')">en</button> <button class="btn btn-info" (click)="switchLanguage('en')">en</button>
<button class="btn btn-info" (click)="switchLanguage('fr')">fr</button> <button class="btn btn-info" (click)="switchLanguage('fr')">fr</button>
</div> </div>
<h1 translate>Title</h1> <h1 i18n>{{"Title"|translate}}</h1>
<div> <div>
{{ 'Intro' | translate:user }} {{"Intro"|translate:user}}
</div> </div>
</div> </div>

View File

@ -22,9 +22,10 @@
<button <button
(click)="addAnswer()" (click)="addAnswer()"
class="btn-outline btn-block"> class="btn-outline btn-block"
i18n>
Ajouter Ajouter
</button> </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> </div>

View File

@ -1,5 +1,5 @@
<div i18n> <div i18n>
Config spécialement pour les dates {{"dates.title"|translate}}
</div> </div>
<div> <div>
@ -8,8 +8,8 @@
id="multi_hours" id="multi_hours"
[(ngModel)]="config.allowSeveralHours" [(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> </select>
<label for="multi_hours"> <label for="multi_hours">
@ -28,13 +28,13 @@
(click)="addDate()" (click)="addDate()"
i18n i18n
> >
Ajouter une plage de dates {{"dates.add"|translate}}
</button> </button>
<div class="dates-list"> <div class="dates-list">
{{config.dateList.length}} {{config.dateList.length}}
<span i18n> <span i18n>
choix de Dates {{"dates.count_dates"|translate}}
</span> </span>
<div <div
*ngFor="let choice of config.dateList; index as id" *ngFor="let choice of config.dateList; index as id"

View File

@ -1,6 +1,6 @@
<h1 i18n> <h1 i18n>
Et c'est tout pour nous! {{"resume.title"|translate}}
</h1> </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>

View File

@ -1,14 +1,14 @@
<h1 i18n> <h1 i18n>
Visibilité des réponses {{"visibility.title"|translate}}
</h1> </h1>
<h1 i18n> <h1 i18n>
Votes {{"visibility.votes"|translate}}
</h1> </h1>
<h1 i18n> <h1 i18n>
Archivage {{"visibility.archiving"|translate}}
</h1> </h1>
<h1 i18n> <h1 i18n>
Accès au sondage {{"visibility.access"|translate}}
</h1> </h1>
<a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">C'est parfait!</a> <a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">C'est parfait!</a>

View File

@ -1,29 +1,29 @@
<nav class="choices"> <nav class="choices">
<a [routerLink]="'/step/creation'"> <a [routerLink]="'/step/creation'" i18n>
Création Création
</a> </a>
<a [routerLink]="'/step/date'"> <a [routerLink]="'/step/date'" i18n>
Les Dates Les Dates
</a> </a>
<a [routerLink]="'/step/answers'"> <a [routerLink]="'/step/answers'" i18>
Réponses Réponses
</a> </a>
<a [routerLink]="'/step/visibility'"> <a [routerLink]="'/step/visibility'" i18n>
Visibilité Visibilité
</a> </a>
<a [routerLink]="'/step/base'"> <a [routerLink]="'/step/base'" i18n>
Base Base
</a> </a>
<a [routerLink]="'/step/pictures'"> <a [routerLink]="'/step/pictures'" i18n>
Images Images
</a> </a>
<a [routerLink]="'/step/resume'"> <a [routerLink]="'/step/resume'" i18n>
Résumé Résumé
</a> </a>
<a [routerLink]="'/step/kind'"> <a [routerLink]="'/step/kind'" i18n>
Page démo Page démo
</a> </a>
<a [routerLink]="'/home'"> <a [routerLink]="'/home'" i18n>
Accueil Accueil
</a> </a>
</nav> </nav>