Merge branch 'minor-works' into 'dev'

Minor works

See merge request framasoft/framadate/funky-framadate-front!3
This commit is contained in:
ty kayn 2019-10-15 10:58:37 +02:00
commit 504d35ffdb
3 changed files with 13 additions and 12 deletions

View File

@ -24,4 +24,7 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
## Further help ## Further help
Before using ng for the first time in this project, use `npm i` to install needed npm modules.
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

View File

@ -3,21 +3,19 @@
</div> </div>
<div> <div>
<select
name="multi_hours"
id="multi_hours"
[(ngModel)]="config.allowSeveralHours"
>
<option value="true">{{"dates.multiple.different"|translate}}</option>
<option value="false">{{"dates.multiple.identical"|translate}}</option>
</select>
<label for="multi_hours"> <label for="multi_hours">
<span i18n> <span i18n>
Je souhaite mettre des créneaux horaires Je souhaite mettre des créneaux horaires
</span> </span>
<select
<span i18n> name="multi_hours"
id="multi_hours"
[(ngModel)]="config.allowSeveralHours"
>
<option value="true">{{"dates.multiple.different"|translate}}</option>
<option value="false">{{"dates.multiple.identical"|translate}}</option>
</select>
<span i18n>
pour chaque journée pour chaque journée
</span> </span>
</label> </label>

View File

@ -50,7 +50,7 @@
"continue": "Voyons ce que ça donne" "continue": "Voyons ce que ça donne"
}, },
"resume": { "resume": {
"title": "Et c'est tout pour nous!", "title": "Et c'est tout pour nous !",
"admins": "Coté administrateur-ice-eux", "admins": "Coté administrateur-ice-eux",
"users": "Coté sondés", "users": "Coté sondés",
"links_mail": "recevoir les liens par e-mail" "links_mail": "recevoir les liens par e-mail"