diff --git a/VERSION b/VERSION index 3eefcb9d..9084fa2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 +1.1.0 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 20e1d107..2a84636f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,22 @@ # CHANGELOG -## 1.0.0 (2024-03-18) +## 1.1.0 - 2024-04-06 + +### Main new features + +* New backoffice views to manage site module data (#402 by @hypsug0) +* Some new github actions (by @hypsug0) + +### Fixes + +* Fix send email on registration (#396 by @PNPyrenees) +* Standardizing date formatting (#401 by @hypsug0) +* Fix new obs pointer not customizable (#400 by @hypsug0) +* Improve english translations (by @hypsug0) +* Docs and changelog improvements (by @camillemonchicourt) +* Fix invalid password check on password with some special characters (by @hypsug0) + +## 1.0.0 - 2024-03-18 ### Main new features diff --git a/frontend/src/app/auth/register/register.component.html b/frontend/src/app/auth/register/register.component.html index 6600562d..2128fa85 100644 --- a/frontend/src/app/auth/register/register.component.html +++ b/frontend/src/app/auth/register/register.component.html @@ -53,7 +53,7 @@

Créez votre compte

i18n-placeholder="Your email input placeholder label@@yourEmailInputPlaceholder" placeholder="Entrez votre email" [(ngModel)]="user.email" #email="ngModel" autocomplete="email" [ngModelOptions]="{ updateOn: 'blur' }" required - pattern="^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" /> + pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,3}$" /> @@ -76,12 +76,15 @@

Créez votre compte

- - Les mots de passe diffèrent. + +
+ Doit contenir au moins un chiffre et une lettre majuscule et minuscule, et au moins 8 caractères. +
+
+ Les mots de passe diffèrent. +
@@ -90,17 +93,21 @@

Créez votre compte

+ pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" required />
- + [ngModelOptions]="{ updateOn: 'blur' }" pattern="{{ password.value }}" /> +
+ Please provide a valid city. +
+
diff --git a/frontend/src/app/auth/register/register.component.ts b/frontend/src/app/auth/register/register.component.ts index 918ef69c..d0eccd55 100644 --- a/frontend/src/app/auth/register/register.component.ts +++ b/frontend/src/app/auth/register/register.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, LOCALE_ID } from '@angular/core'; import { Router } from '@angular/router'; import { Subject, throwError } from 'rxjs'; import { debounceTime, catchError, map } from 'rxjs/operators'; - +import { Observable } from 'rxjs'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { RegisterUser } from '../models'; @@ -80,7 +80,7 @@ export class RegisterComponent { ); } - handleError(error) { + handleError(error): Observable { let errorMessage = ''; if (error.error instanceof ErrorEvent) { console.error('client-side error'); @@ -101,15 +101,15 @@ export class RegisterComponent { return throwError(errorMessage); } - displayErrorMessage(message) { + displayErrorMessage(message: string): void { this._error.next(message); } - displaySuccessMessage(message) { + displaySuccessMessage(message: string): void { this._success.next(message); } - onUploadAvatar($event) { + onUploadAvatar($event): void { if ($event) { if ($event.target.files && $event.target.files[0]) { const file = $event.target.files[0]; @@ -159,7 +159,7 @@ export class RegisterComponent { } } - loadCaptchaScript() { + loadCaptchaScript(): void { if (!MainConfig.HCAPTCHA_SITE_KEY) { return; } @@ -179,7 +179,7 @@ export class RegisterComponent { } } - resetCaptcha() { + resetCaptcha(): void { if (window.hcaptcha === null) { return; } @@ -187,7 +187,7 @@ export class RegisterComponent { window.hcaptcha.reset(); } - renderCaptcha() { + renderCaptcha(): void { if (window.hcaptcha === null) { return; } @@ -197,7 +197,7 @@ export class RegisterComponent { }); } - captchaCallback(token) { + captchaCallback(token): void { this.user.captchaToken = token; } } diff --git a/frontend/src/i18n/messages.en.xlf b/frontend/src/i18n/messages.en.xlf index 8f277539..89509d57 100644 --- a/frontend/src/i18n/messages.en.xlf +++ b/frontend/src/i18n/messages.en.xlf @@ -1,946 +1,1152 @@ - - - - CloseClose - - ../node_modules/@ng-bootstrap/ng-bootstrap/alert/alert.d.ts - 3 - - - - PreviousPrevious - - ../node_modules/@ng-bootstrap/ng-bootstrap/carousel/carousel.d.ts - 13 - - - - NextNext - - ../node_modules/@ng-bootstrap/ng-bootstrap/carousel/carousel.d.ts - 17 - - - - Previous monthPrevious month - - ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts - 4 - - - ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts - 5 - - - - Next monthNext month - - ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts - 26 - - - ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts - 27 - - - - Select monthSelect month - - - ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts5../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts6 - - Select yearSelect year - - - ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts13../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts14 - - «««« - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 2 - - - - «« - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 3 - - - - »» - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 4 - - - - »»»» - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 5 - - - - FirstFirst - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 14 - - - - PreviousPrevious - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts24 - - NextNext - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts44 - - LastLast - - ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts53 - - %% - - ../node_modules/@ng-bootstrap/ng-bootstrap/progressbar/progressbar.d.ts - 6 - - - - Increment hoursIncrement hours - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 9 - - - - HHHH - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts13 - - HoursHours - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts15 - - Decrement hoursDecrement hours - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts23 - - Increment minutesIncrement minutes - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts32 - - MMMM - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts35 - - MinutesMinutes - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts37 - - Decrement minutesDecrement minutes - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts45 - - Increment secondsIncrement seconds - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts54 - - SSSS - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts57 - - SecondsSeconds - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts59 - - Decrement secondsDecrement seconds - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts67 - - - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts75 - - - - ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts76 - - CloseClose - - ../node_modules/@ng-bootstrap/ng-bootstrap/toast/toast.d.ts - 8 - - - - Créez votre compteRegister - - - Create account - app/auth/register/register.component.html2app/core/topbar/topbar.component.html154 - - - Impossible de valider votre email. - - Unable to validate your email - - - app/auth/register/register.component.html - 31 - - Unable to valid email - - - Votre pseudonymeVotre pseudonyme - - app/auth/register/register.component.html - 58 - - - app/auth/user-dashboard/user-dashboard.component.html - 280 - - Your pseudo - - - Entrez votre pseudonymeEntrez votre pseudonyme - - app/auth/register/register.component.html - 71 - - Enter your pseudo - - - Votre emailVotre email - - app/auth/register/register.component.html - 82 - - Your email form label - - - Entrez votre emailEntrez votre email - - app/auth/register/register.component.html - 95 - - - app/auth/user-dashboard/user-dashboard.component.html - 322 - - Your email input placeholder label - - - Votre prénomVotre prénom - - app/auth/register/register.component.html - 110 - - - app/auth/register/register.component.html - 117 - - your first name - - - Votre nomVotre nom - - app/auth/register/register.component.html - 127 - - your last name label - - - Entrez votre nomEntrez votre nom - - app/auth/register/register.component.html - 134 - - Enter your last name - - - - Les mots de passe diffèrent. - - Les mots de passe diffèrent. - - - app/auth/register/register.component.html - 152 - - Different password error - - - Votre mot de passeVotre mot de passe - - app/auth/register/register.component.html - 158 - - Your password label - - - Votre mot de passeVotre mot de passe - - app/auth/register/register.component.html - 164 - - Your password input - - - Confirmez votre mot de passeConfirmez votre mot de passe - - app/auth/register/register.component.html - 177 - - - - Confirmez le mot de passeConfirmez le mot de passe - - app/auth/register/register.component.html - 187 - - Your confirm password input - - - - Veuillez accepter les conditions d'utilisation. - + + + + Close + Close + + ../node_modules/@ng-bootstrap/ng-bootstrap/alert/alert.d.ts3 + + Previous + Previous + + ../node_modules/@ng-bootstrap/ng-bootstrap/carousel/carousel.d.ts13 + + Next + Next + + ../node_modules/@ng-bootstrap/ng-bootstrap/carousel/carousel.d.ts17 + + Previous month + Previous month + + + ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts4../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts5 + + Next month + Next month + + + ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts26../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts27 + + Select month + Select month + + + + + ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts5../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts6 + + Select year + Select year + + + + + ../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts13../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts14 + + «« + «« + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts2 + + « + « + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts3 + + » + » + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts4 + + »» + »» + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts5 + + First + First + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts14 + + Previous + Previous + + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts24 + + Next + Next + + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts44 + + Last + Last + + + ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts53 + + % + % + + ../node_modules/@ng-bootstrap/ng-bootstrap/progressbar/progressbar.d.ts6 + + Increment hours + Increment hours + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts9 + + HH + HH + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts13 + + Hours + Hours + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts15 + + Decrement hours + Decrement hours + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts23 + + Increment minutes + Increment minutes + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts32 + + MM + MM + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts35 + + Minutes + Minutes + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts37 + + Decrement minutes + Decrement minutes + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts45 + + Increment seconds + Increment seconds + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts54 + + SS + SS + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts57 + + Seconds + Seconds + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts59 + + Decrement seconds + Decrement seconds + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts67 + + + + + + + + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts75 + + + + + + + + + + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts76 + + Close + Close + + ../node_modules/@ng-bootstrap/ng-bootstrap/toast/toast.d.ts8 + + Créez votre compte + Register + + + Create account + + app/auth/register/register.component.html + 2 + + + app/core/topbar/topbar.component.html + 74 + + + + + Impossible de valider votre email. + + + Unable to validate your email + + + Unable to valid email + + app/auth/register/register.component.html + 15 + + + + Votre pseudonyme + Your username + + + Your pseudo + + + app/auth/register/register.component.html33app/auth/user-dashboard/user-dashboard.component.html137 + + Entrez votre pseudonyme + Enter your username + + Enter your pseudo + + app/auth/register/register.component.html + 40 + + + + Votre email + Your email + + Your email form label + + app/auth/register/register.component.html + 47 + + + + Entrez votre email + Enter your email + + + Your email input placeholder label + + + app/auth/register/register.component.html54app/auth/user-dashboard/user-dashboard.component.html160 + + Votre prénom + Your first name + + + your first name + + app/auth/register/register.component.html + 64 + + + app/auth/register/register.component.html + 66 + + + + Votre nom + Your last name + + your last name label + + app/auth/register/register.component.html + 72 + + + + Entrez votre nom + Enter your last name + + Enter your last name + + app/auth/register/register.component.html + 74 + + + + + Doit contenir au moins un chiffre et une lettre majuscule et minuscule, et au moins 8 caractères. + + + Must contain at least one number and one upper- and lower-case letter, and at + least 8 characters. + + + app/auth/register/register.component.html + 81 + + Strong password required + + + + Les mots de passe diffèrent. + + + Passwords differ. + + + Different password error + + app/auth/register/register.component.html + 85 + + + + Votre mot de passe + Your password + + Your password label + + app/auth/register/register.component.html + 92 + + + + Votre mot de passe + Your password + + Your password input + + app/auth/register/register.component.html + 94 + + + + Confirmez votre mot de passe + Confirm your password + + + app/auth/register/register.component.html + 101 + + + + Confirmez le mot de passe + Confirm your password + + Your confirm password input + + app/auth/register/register.component.html + 105 + + + + Veuillez accepter les conditions d'utilisation. + + + Please accept the terms of use. + + + Accept UGC + + app/auth/register/register.component.html + 114 + + + + conditions d'utilisation + terms of use + + Use condition + + app/auth/register/register.component.html + 121 + + + + + S'enregistrer + + + Register + + + register link + + app/auth/register/register.component.html + 132 + + + + + Fermer + + + Close + + + + close modal + + + + app/auth/register/register.component.html137app/auth/login/login.component.html163app/programs/media-galery/media-galery.component.html50 + + Se connecter + SignIn + + + login + + app/auth/login/login.component.html + 2 + + + app/auth/login/login.component.html + 152 + + + app/core/topbar/topbar.component.html + 70 + + + + Votre Email + Votre Email + + app/auth/login/login.component.html + 32 + + Your email + + + Entrez votre email + Enter your email + + + Enter your email + + app/auth/login/login.component.html + 49 + + + app/auth/login/login.component.html + 96 + + + + + Récupérer le compte + + + Recover your account + + + app/auth/login/login.component.html + 65 + + Recover account + + + Email ou pseudo + Email or username + + email or username + + app/auth/login/login.component.html + 79 + + + + Mot de passe + Password + + Password input label + + app/auth/login/login.component.html + 110 + + + + Entrez votre mot de passe + Enter your password + + Password input + + app/auth/login/login.component.html + 127 + + + + Mot de passe oublié ? + Forgot your password? + + Forgotten password link + + app/auth/login/login.component.html + 141 + + + + AJOUTER UNE OBSERVATION + NEW OBSERVATION + + + Add new obs + app/programs/observations/modalflow/steps/onboard/onboard.component.html2app/programs/observations/modalflow/steps/committed/committed.component.html3 + + S'incrire et contribuer au site + Register and + contribute + + register and contribute + + app/programs/observations/modalflow/steps/onboard/onboard.component.html24 + + Continuer sans s'enregistrer + Continue + without registration + + continue unregistered + + app/programs/observations/modalflow/steps/onboard/onboard.component.html30 + + Vous + avez déjà un compte ? + Connectez-vous ! + Already have an account? Please log in! + + Invite to login + + app/programs/observations/modalflow/steps/onboard/onboard.component.html36 + + + Informations complémentaires + + + Additional information - - app/auth/register/register.component.html - 201 - - Accept UGC - - - conditions d'utilisationconditions d'utilisation - - app/auth/register/register.component.html - 218 - - Use condition - - - - S'enregistrer - - S'enregistrer - - - register link - app/auth/register/register.component.html234 - - - Fermer - - Fermer - - - - close modal - app/auth/register/register.component.html245app/auth/login/login.component.html163app/programs/media-galery/media-galery.component.html49 - - Se connecterSignIn - - - - login - app/auth/login/login.component.html2app/auth/login/login.component.html152app/core/topbar/topbar.component.html147 - - Votre EmailVotre Email - - app/auth/login/login.component.html - 32 - - Your email - - - Entrez votre emailEntrez votre email - - - Enter your email - app/auth/login/login.component.html49app/auth/login/login.component.html96 - - - Récupérer le compte - - Récupérer le compte - - - app/auth/login/login.component.html - 65 - - Recover account - - - Email ou pseudoEmail or username - - email or username - app/auth/login/login.component.html79 - - Mot de passeMot de passe - - Password input label - app/auth/login/login.component.html110 - - Entrez votre mot de passeEntrez votre mot de passe - - Password input - app/auth/login/login.component.html127 - - Mot de passe oublié ?Mot de passe oublié ? - - Forgotten password link - app/auth/login/login.component.html141 - - AJOUTER UNE OBSERVATIONAJOUTER UNE OBSERVATION - - app/programs/observations/modalflow/steps/onboard/onboard.component.html - 2 - - - app/programs/observations/modalflow/steps/committed/committed.component.html - 3 - - Add new obs - - - S'incrire et contribuer au siteS'incrire et contribuer au site - - app/programs/observations/modalflow/steps/onboard/onboard.component.html - 35 - - register and contribute - - - Continuer sans s'enregistrerContinuer sans s'enregistrer - - continue unregistered - app/programs/observations/modalflow/steps/onboard/onboard.component.html44 - - Vous avez déjà un compte ? Connectez-vous !Vous avez déjà un compte ? Connectez-vous ! - - Invite to login - app/programs/observations/modalflow/steps/onboard/onboard.component.html51 - - - Informations complémentaires - - Informations complémentaires - - - Additional information - app/programs/observations/form/form.component.html127 - - Date de l'observationDate de l'observation - - observation date - app/programs/observations/form/form.component.html136app/programs/observations/validation/validation.component.html140 - - jj/mm/aaaajj/mm/aaaa - - + + Additional information + + app/programs/observations/form/form.component.html91 + + Date de l'observation + Observation date + + observation date + + + app/programs/observations/form/form.component.html97app/programs/observations/validation/validation.component.html99 + + jj/mm/aaaa + jj/mm/aaaa + + expected date format - app/programs/observations/form/form.component.html144 - - DénombrementDénombrement - Enumeration Label - app/programs/observations/form/form.component.html156 - - NombreNombre + app/programs/observations/form/form.component.html99 + + Dénombrement + Count - + Enumeration Label + + app/programs/observations/form/form.component.html104 + + Nombre + Number + + Enumeration Placeholder - app/programs/observations/form/form.component.html163 - - CommentaireCommentaire - Comment Input Label - app/programs/observations/form/form.component.html187app/programs/observations/validation/validation.component.html161 - - Votre commentaireVotre commentaire + app/programs/observations/form/form.component.html106 + + Commentaire + Comment + + Comment Input Label - + + app/programs/observations/form/form.component.html117app/programs/observations/validation/validation.component.html113 + + Votre commentaire + Your comment + + Comment Input Placeholder - app/programs/observations/form/form.component.html192app/programs/observations/validation/validation.component.html168 - - Photos existantes (cocher pour supprimer)Photos existantes (cocher pour supprimer) - - Existing Photos - app/programs/observations/form/form.component.html202app/programs/sites/form/form.component.html51 - - Ajouter une photoAjouter une photo - - Add photo - app/programs/observations/form/form.component.html221 - - - Où avez-vous observé cette espèce ? - - Où avez-vous observé cette espèce ? - - - observation Location - app/programs/observations/form/form.component.html232 - - - Veuillez zoomer pour localiser votre observation. - (zoom min: - ) - + + + app/programs/observations/form/form.component.html119app/programs/observations/validation/validation.component.html116 + + Photos existantes (cocher pour supprimer) + Uploaded pictures (tick to delete) + + Existing Photos + + + app/programs/observations/form/form.component.html124app/programs/sites/form/form.component.html35 + + Ajouter une photo + Add a photo + + Add photo + + app/programs/observations/form/form.component.html132 + + + Où avez-vous observé cette espèce ? + + + Where have you seen this species? + + + observation Location + + app/programs/observations/form/form.component.html140 + + Veuillez zoomer pour localiser votre observation. (zoom min: - ) - + ) + + Please zoom in to locate your observation. + (zoom min: ) + + - app/programs/observations/form/form.component.html240 - - Veuillez zoomer pour localiser votre observation.Veuillez zoomer pour localiser votre observation. + app/programs/observations/form/form.component.html145 + + Veuillez zoomer pour localiser votre observation. + Please zoom in to locate your observation. - + Zooming instruction - app/programs/observations/form/form.component.html259app/programs/sites/siteform/siteform.component.html28app/programs/observations/validation/validation.component.html154 - - Cliquez sur la carte pour renseigner le lieu précis de - votre observationCliquez sur la carte pour renseigner le lieu précis de - votre observation - - click on map instruction - app/programs/observations/form/form.component.html272 - - E-mail de contact - E-mail de contact + + + + app/programs/observations/form/form.component.html158app/programs/sites/siteform/siteform.component.html28app/programs/observations/validation/validation.component.html110 + + Cliquez sur + la carte pour renseigner le lieu + précis de + votre observation + Click on the map to enter the precise location of your + observation + + click on map instruction + + app/programs/observations/form/form.component.html163 + + E-mail de contact + + Contact e-mail - Contact email input label - app/programs/observations/form/form.component.html299 - - E-MailE-Mail + Contact email input label + + app/programs/observations/form/form.component.html178 + + E-Mail + E-Mail - + Contact email input placeholder - app/programs/observations/form/form.component.html306 - - - Champs manquants - - Champs manquants - - - Missing fields alert - app/programs/observations/form/form.component.html319 - - - MODIFIER L'OBSERVATION - - MODIFIER L'OBSERVATION - - - Update obs - app/programs/observations/modalflow/steps/committed/committed.component.html6app/programs/observations/obs.component.html73app/programs/observations/obs.component.html73app/programs/observations/obs.component.html73 - - - Valider l'observation - - Valider l'observation - - - Valid obs btn - app/programs/observations/modalflow/steps/committed/committed.component.html46app/programs/observations/validation/validation.component.html210 - - - Modifier l'observation - - Modifier l'observation - - - app/programs/observations/modalflow/steps/committed/committed.component.html - 56 - - Upddate obs btn - - - - Annuler - - Annuler - - - Cancel - app/programs/observations/modalflow/steps/committed/committed.component.html59app/programs/observations/validation/validation.component.html213 - - Félicitations !Félicitations ! - - app/programs/observations/modalflow/steps/congrats/congrats.component.html - 24 - - - app/programs/observations/modalflow/steps/reward/reward.component.html - 11 - - Congrats - - - - Votre observation a bien été ajoutée ! - - Votre observation a bien été ajoutée ! - - - app/programs/observations/modalflow/steps/congrats/congrats.component.html - 25 - - Congrats message - - - Observé par - le Observé par - le - - app/programs/observations/modalflow/steps/congrats/congrats.component.html - 30 - - Obs date and observer - - - - - - - - - app/programs/observations/modalflow/steps/reward/reward.component.html - 12 - - New reward message - - - {VAR_PLURAL, plural, =1 {Vous venez d'obtenir - ce badge } other {Vous venez d'obtenir ces badges } }{VAR_PLURAL, plural, =1 {Vous venez d'obtenir - ce badge } other {Vous venez d'obtenir ces badges } } - - app/programs/observations/modalflow/steps/reward/reward.component.html - 13 - - - Aucune photoNo photo - - app/programs/media-galery/media-galery.component.html - 17 - - No medias - - - Toutes espècesToutes espèces - - All species select option - app/programs/observations/list/list.component.html14 - - Toutes communesToutes communes - - + + app/programs/observations/form/form.component.html182 + + + Champs manquants + + + Missing fields + + + Missing fields alert + + app/programs/observations/form/form.component.html189 + + + MODIFIER L'OBSERVATION + + + UPDATE OBSERVATION + + + Update obs + + + + + app/programs/observations/modalflow/steps/committed/committed.component.html6app/programs/observations/obs.component.html74app/programs/observations/obs.component.html74app/programs/observations/obs.component.html74 + + + Valider l'observation + + + Validate observation + + + Valid obs btn + + + app/programs/observations/modalflow/steps/committed/committed.component.html32app/programs/observations/validation/validation.component.html149 + + + Modifier l'observation + + + Update observation + + + Upddate obs btn + + app/programs/observations/modalflow/steps/committed/committed.component.html37 + + + Annuler + + + Cancel + + + Cancel + + + app/programs/observations/modalflow/steps/committed/committed.component.html40app/programs/observations/validation/validation.component.html153 + + Félicitations ! + Congratulations! + + + Congrats + + + app/programs/observations/modalflow/steps/congrats/congrats.component.html16app/programs/observations/modalflow/steps/reward/reward.component.html6 + + + Votre observation a bien été ajoutée ! + + + Your observation has been successfully added! + + + Congrats message + + app/programs/observations/modalflow/steps/congrats/congrats.component.html17 + + Observé par + le + Observed by the + + Obs date and observer + + app/programs/observations/modalflow/steps/congrats/congrats.component.html21 + + + + + + + + + New reward message + + app/programs/observations/modalflow/steps/reward/reward.component.html7 + + {VAR_PLURAL, plural, =1 {Vous venez d'obtenir + ce badge } other {Vous venez d'obtenir ces badges } } + {VAR_PLURAL, plural, =1 {Vous venez d'obtenir + ce badge } other {Vous venez d'obtenir ces badges } } + + + app/programs/observations/modalflow/steps/reward/reward.component.html8 + + Aucune photo + No photo + + No medias + + app/programs/media-galery/media-galery.component.html18 + + Toutes espèces + All species + + All species select option + + app/programs/observations/list/list.component.html8 + + Toutes communes + All municipalities + + All municipalities select option - app/programs/observations/list/list.component.html40 - - all validation statuses - - all validation statuses + + app/programs/observations/list/list.component.html22 + + + Tous statuts de validation + + + All validation statuses + + + All validation status select option + + app/programs/observations/list/list.component.html33 + + Mes + Observations à valider   + + + My Observations + + My obs + + app/programs/observations/list/list.component.html43 + + Veuillez zoomer pour localiser votre observation. + Please zoom in to locate your observation. + + Zooming warning + + app/programs/sites/siteform/siteform.component.html45 + + Scrollez pour en voir plus ! + Scroll down to see more! + + Scroll down to see more ! + + app/home/home.component.html + 6 + + + + Observations + Observations + + Observations + + app/home/home.component.html + 18 + + + + Espèces + Species + + species + + app/home/home.component.html + 27 + + + + Observateurs + Observers + + Observers + + app/home/home.component.html + 36 + + + + Les programmes du moment + Current programs + + Programs of the moment + + app/home/home.component.html + 98 + + + + Précédent + Previous + + Carousel previous + + app/home/home.component.html + 123 + + + + + Prochain + Next + + Carousel next + + app/home/home.component.html + 127 + + + + Se déconnecter + Sign out + + + logout + logout + + app/auth/logout/logout.component.html + 3 + + + app/auth/logout/logout.component.html + 16 + + + app/core/topbar/topbar.component.html + 64 + + + + Accueil + Home + + home + + app/core/topbar/topbar.component.html + 19 + + + + A propos + About + + about + + app/core/topbar/topbar.component.html + 33 + + + + Admin + + Admin + + + admin + + app/core/topbar/topbar.component.html + 37 + + + + Validation + Validation + + validation + + app/core/topbar/topbar.component.html + 43 + + + + Mon tableau de bord + My dashboard + + my Dasboard Link + + app/core/topbar/topbar.component.html + 54 + + + + Mes badges + My rewards + + My badges + + app/auth/user-dashboard/user-dashboard.component.html40 + + + Récompenses géneral + + + General awards - - app/programs/observations/list/list.component.html - 57 - - All validation status select option - - - Mes Observations à valider - Mes Observations - - - My obs - app/programs/observations/list/list.component.html67 - - Veuillez zoomer pour localiser votre observation.Veuillez zoomer pour localiser votre observation. - - Zooming warning - app/programs/sites/siteform/siteform.component.html45 - - Scrollez pour en voir plus !Scrollez pour en voir plus ! - - Scroll down to see more ! - app/home/home.component.html6 - - ObservationsObservations - - Observations - app/home/home.component.html18 - - EspècesEspèces - - species - app/home/home.component.html27 - - ObservateursObservateurs - - Observers - app/home/home.component.html36 - - Les programmes du momentLes programmes du moment - - Programs of the moment - app/home/home.component.html98 - PrécédentPrécédent - - Carousel previous - app/home/home.component.html123 - - - ProchainNext - - Carousel next - app/home/home.component.html127 - - Se déconnecterSign out - - - - logout - logout - app/auth/logout/logout.component.html3app/auth/logout/logout.component.html16app/core/topbar/topbar.component.html137 - - AccueilHome - - app/core/topbar/topbar.component.html - 51 - - home - - - A proposA propos - - app/core/topbar/topbar.component.html - 75 - - about - - - Admin - Admin - - - app/core/topbar/topbar.component.html - 86 - - admin - - ValidationValidation - - app/core/topbar/topbar.component.html - 97 - - validation - - - My dashboardMy dashboard - - my Dasboard Link - app/core/topbar/topbar.component.html113 - - Mes badgesMes badges - - app/auth/user-dashboard/user-dashboard.component.html - 60 - - My badges - - - - Récompenses géneral - - Récompenses géneral - - - app/auth/user-dashboard/user-dashboard.component.html - 65 - - General Awards - - - Exporter mes données personnellesExporter mes données personnelles - - app/auth/user-dashboard/user-dashboard.component.html - 185 - - Export personnal data btn - - - Exporter mes observationsExporter mes observations - - app/auth/user-dashboard/user-dashboard.component.html - 195 - - Export personnal observations btn - - - Exporter mes sitesExporter mes sites - - app/auth/user-dashboard/user-dashboard.component.html - 205 - - Export personnal sites btn - - - Supprimer mon compteSupprimer mon compte - - app/auth/user-dashboard/user-dashboard.component.html - 214 - - Delete Account - - - - Mettre à jour vos données personnelles - - Mettre à jour vos données personnelles - - - app/auth/user-dashboard/user-dashboard.component.html - 231 - - Update personnal data - - - Entrez votre nom d'utilisateurEntrez votre nom d'utilisateur - - app/auth/user-dashboard/user-dashboard.component.html - 296 - - + + General Awards + + app/auth/user-dashboard/user-dashboard.component.html42 + + Exporter mes données + personnelles + Export my personal data + + Export personnal data btn + + app/auth/user-dashboard/user-dashboard.component.html82 + + Exporter mes + observations + Export my observations + + Export personnal observations btn + + app/auth/user-dashboard/user-dashboard.component.html87 + + Exporter mes sites + Export my sites + + Export personnal sites btn + + app/auth/user-dashboard/user-dashboard.component.html92 + + Supprimer mon + compte + Delete my account + + Delete Account + + app/auth/user-dashboard/user-dashboard.component.html95 + + + Mettre à jour vos données personnelles + + + Update your personal data + + + Update personnal data + + app/auth/user-dashboard/user-dashboard.component.html112 + + Entrez votre nom d'utilisateur + Enter your username + + your username placeholder - - - Votre email *Votre email * - - app/auth/user-dashboard/user-dashboard.component.html - 306 - - your email label - - - Votre prénom *Votre prénom * - - app/auth/user-dashboard/user-dashboard.component.html - 334 - - your first name - - - Entrez votre prénomEntrez votre prénom - - app/auth/user-dashboard/user-dashboard.component.html - 344 - - + + app/auth/user-dashboard/user-dashboard.component.html146 + + Votre email * + Your email * + + your email label + + app/auth/user-dashboard/user-dashboard.component.html152 + + Votre prénom * + Votre first name * + + your first name + + app/auth/user-dashboard/user-dashboard.component.html168 + + Entrez votre prénom + Enter your first name + + your first name placeholder - - - Votre nom *Votre nom * - - app/auth/user-dashboard/user-dashboard.component.html - 353 - - your surname label - - - Entrez votre nomEntrez votre nom - - app/auth/user-dashboard/user-dashboard.component.html - 363 - - + + app/auth/user-dashboard/user-dashboard.component.html172 + + Votre nom * + Your last name * + + your surname label + + app/auth/user-dashboard/user-dashboard.component.html177 + + Entrez votre nom + Enter your last name + + your surname placeholder - - - - Les mots de passe diffèrent. - - Les mots de passe diffèrent. - - - app/auth/user-dashboard/user-dashboard.component.html - 377 - - error different passwords - - - Votre nouveau mot de passeVotre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 386 - - your password label - - - Votre nouveau mot de passeVotre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 397 - - + + app/auth/user-dashboard/user-dashboard.component.html181 + + + Les mots de passe diffèrent. + + + Passwords differ. + + + error different passwords + + app/auth/user-dashboard/user-dashboard.component.html189 + + Votre nouveau mot de + passe + Your new password + + your password label + + app/auth/user-dashboard/user-dashboard.component.html195 + + Votre nouveau mot de passe + Your new password + + your password placeholder - - - Confirmez votre nouveau mot de passeConfirmez votre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 409 - - + + app/auth/user-dashboard/user-dashboard.component.html200 + + Confirmez votre nouveau mot de passe + Confirm your new password + + your password confirm label - - - Votre nouveau mot de passeVotre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 419 - - + + app/auth/user-dashboard/user-dashboard.component.html208 + + Votre nouveau mot de passe + Your new password + + your password confirm placeholder - - - - Mettre à jour - - Mettre à jour - - - app/auth/user-dashboard/user-dashboard.component.html - 441 - - update personnal data btn - - - vous allez être redirigé automatiquement sur la page d'accueilvous allez être redirigé automatiquement sur la page d'accueil - - app/auth/confirm-email/confirm-email.component.html - 5 - - Redirect to home - - - + + app/auth/user-dashboard/user-dashboard.component.html212 + + + Mettre à jour + + + Update + + + update personnal data btn + + app/auth/user-dashboard/user-dashboard.component.html226 + + vous allez être redirigé automatiquement sur la page d'accueil + you will be automatically redirected to the home page + + Redirect to home + app/auth/confirm-email/confirm-email.component.html5 + + diff --git a/frontend/src/i18n/messages.fr.xlf b/frontend/src/i18n/messages.fr.xlf index 4ea2c057..21c75c75 100644 --- a/frontend/src/i18n/messages.fr.xlf +++ b/frontend/src/i18n/messages.fr.xlf @@ -180,86 +180,64 @@ Create account - app/auth/register/register.component.html2app/core/topbar/topbar.component.html154 + app/auth/register/register.component.html2app/core/topbar/topbar.component.html74 Impossible de valider votre email. Impossible de valider votre email. - - app/auth/register/register.component.html - 31 - + Unable to valid email - + app/auth/register/register.component.html15 Votre pseudonymeVotre pseudonyme - - app/auth/register/register.component.html - 58 - - - app/auth/user-dashboard/user-dashboard.component.html - 280 - + + Your pseudo - + app/auth/register/register.component.html33app/auth/user-dashboard/user-dashboard.component.html137 Entrez votre pseudonymeEntrez votre pseudonyme - - app/auth/register/register.component.html - 71 - + Enter your pseudo - + app/auth/register/register.component.html40 Votre emailVotre email - - app/auth/register/register.component.html - 82 - + Your email form label - + app/auth/register/register.component.html47 Entrez votre emailEntrez votre email - - app/auth/register/register.component.html - 95 - - - app/auth/user-dashboard/user-dashboard.component.html - 322 - + + Your email input placeholder label - + app/auth/register/register.component.html54app/auth/user-dashboard/user-dashboard.component.html160 Votre prénomVotre prénom - - app/auth/register/register.component.html - 110 - - - app/auth/register/register.component.html - 117 - + + your first name - + app/auth/register/register.component.html64app/auth/register/register.component.html66 Votre nomVotre nom - - app/auth/register/register.component.html - 127 - + your last name label - + app/auth/register/register.component.html72 Entrez votre nomEntrez votre nom + + Enter your last name + app/auth/register/register.component.html74 + + Doit contenir au moins un chiffre et une lettre majuscule et minuscule, et au moins 8 caractères. + + Doit contenir au moins un chiffre et une lettre majuscule et minuscule, et au moins 8 caractères. + app/auth/register/register.component.html - 134 + 81 - Enter your last name + Strong password required @@ -267,63 +245,42 @@ Les mots de passe diffèrent. - - app/auth/register/register.component.html - 152 - + Different password error - + app/auth/register/register.component.html85 Votre mot de passeVotre mot de passe - - app/auth/register/register.component.html - 158 - + Your password label - + app/auth/register/register.component.html92 Votre mot de passeVotre mot de passe - - app/auth/register/register.component.html - 164 - + Your password input - + app/auth/register/register.component.html94 Confirmez votre mot de passeConfirmez votre mot de passe - - app/auth/register/register.component.html - 177 - - + + app/auth/register/register.component.html101 Confirmez le mot de passeConfirmez le mot de passe - - app/auth/register/register.component.html - 187 - + Your confirm password input - + app/auth/register/register.component.html105 Veuillez accepter les conditions d'utilisation. Veuillez accepter les conditions d'utilisation. - - app/auth/register/register.component.html - 201 - + Accept UGC - + app/auth/register/register.component.html114 conditions d'utilisationconditions d'utilisation - - app/auth/register/register.component.html - 218 - + Use condition - + app/auth/register/register.component.html121 S'enregistrer @@ -332,7 +289,7 @@ register link - app/auth/register/register.component.html234 + app/auth/register/register.component.html132 Fermer @@ -342,14 +299,14 @@ close modal - app/auth/register/register.component.html245app/auth/login/login.component.html163app/programs/media-galery/media-galery.component.html49 + app/auth/register/register.component.html137app/auth/login/login.component.html163app/programs/media-galery/media-galery.component.html50 Se connecterSe connecter login - app/auth/login/login.component.html2app/auth/login/login.component.html152app/core/topbar/topbar.component.html147 + app/auth/login/login.component.html2app/auth/login/login.component.html152app/core/topbar/topbar.component.html70 Votre EmailVotre Email @@ -410,22 +367,23 @@ S'incrire et contribuer au siteS'incrire et contribuer au site - - app/programs/observations/modalflow/steps/onboard/onboard.component.html - 35 - + register and contribute - + app/programs/observations/modalflow/steps/onboard/onboard.component.html24 Continuer sans s'enregistrerContinuer sans s'enregistrer continue unregistered - app/programs/observations/modalflow/steps/onboard/onboard.component.html44 + app/programs/observations/modalflow/steps/onboard/onboard.component.html30 - Vous avez déjà un compte ? Connectez-vous !Vous avez déjà un compte ? Connectez-vous ! + Vous + avez déjà un compte ? + Connectez-vous !Vous + avez déjà un compte ? + Connectez-vous ! Invite to login - app/programs/observations/modalflow/steps/onboard/onboard.component.html51 + app/programs/observations/modalflow/steps/onboard/onboard.component.html36 Informations complémentaires @@ -434,50 +392,50 @@ Additional information - app/programs/observations/form/form.component.html127 + app/programs/observations/form/form.component.html91 Date de l'observationDate de l'observation observation date - app/programs/observations/form/form.component.html136app/programs/observations/validation/validation.component.html140 + app/programs/observations/form/form.component.html97app/programs/observations/validation/validation.component.html99 jj/mm/aaaajj/mm/aaaa expected date format - app/programs/observations/form/form.component.html144 + app/programs/observations/form/form.component.html99 DénombrementDénombrement Enumeration Label - app/programs/observations/form/form.component.html156 + app/programs/observations/form/form.component.html104 NombreNombre Enumeration Placeholder - app/programs/observations/form/form.component.html163 + app/programs/observations/form/form.component.html106 CommentaireCommentaire Comment Input Label - app/programs/observations/form/form.component.html187app/programs/observations/validation/validation.component.html161 + app/programs/observations/form/form.component.html117app/programs/observations/validation/validation.component.html113 Votre commentaireVotre commentaire Comment Input Placeholder - app/programs/observations/form/form.component.html192app/programs/observations/validation/validation.component.html168 + app/programs/observations/form/form.component.html119app/programs/observations/validation/validation.component.html116 Photos existantes (cocher pour supprimer)Photos existantes (cocher pour supprimer) Existing Photos - app/programs/observations/form/form.component.html202app/programs/sites/form/form.component.html51 + app/programs/observations/form/form.component.html124app/programs/sites/form/form.component.html35 Ajouter une photoAjouter une photo Add photo - app/programs/observations/form/form.component.html221 + app/programs/observations/form/form.component.html132 Où avez-vous observé cette espèce ? @@ -486,7 +444,7 @@ observation Location - app/programs/observations/form/form.component.html232 + app/programs/observations/form/form.component.html140 Veuillez zoomer pour localiser votre observation. @@ -498,35 +456,39 @@ ) - app/programs/observations/form/form.component.html240 + app/programs/observations/form/form.component.html145 Veuillez zoomer pour localiser votre observation.Veuillez zoomer pour localiser votre observation. Zooming instruction - app/programs/observations/form/form.component.html259app/programs/sites/siteform/siteform.component.html28app/programs/observations/validation/validation.component.html154 + app/programs/observations/form/form.component.html158app/programs/sites/siteform/siteform.component.html28app/programs/observations/validation/validation.component.html110 - Cliquez sur la carte pour renseigner le lieu précis de - votre observationCliquez sur la carte pour renseigner le lieu précis de + Cliquez sur + la carte pour renseigner le lieu + précis de + votre observationCliquez sur + la carte pour renseigner le lieu + précis de votre observation click on map instruction - app/programs/observations/form/form.component.html272 + app/programs/observations/form/form.component.html163 E-mail de contact E-mail de contact Contact email input label - app/programs/observations/form/form.component.html299 + app/programs/observations/form/form.component.html178 E-MailE-Mail Contact email input placeholder - app/programs/observations/form/form.component.html306 + app/programs/observations/form/form.component.html182 Champs manquants @@ -535,7 +497,7 @@ Missing fields alert - app/programs/observations/form/form.component.html319 + app/programs/observations/form/form.component.html189 MODIFIER L'OBSERVATION @@ -544,7 +506,7 @@ Update obs - app/programs/observations/modalflow/steps/committed/committed.component.html6app/programs/observations/obs.component.html73app/programs/observations/obs.component.html73app/programs/observations/obs.component.html73 + app/programs/observations/modalflow/steps/committed/committed.component.html6app/programs/observations/obs.component.html74app/programs/observations/obs.component.html74app/programs/observations/obs.component.html74 Valider l'observation @@ -553,19 +515,16 @@ Valid obs btn - app/programs/observations/modalflow/steps/committed/committed.component.html46app/programs/observations/validation/validation.component.html210 + app/programs/observations/modalflow/steps/committed/committed.component.html32app/programs/observations/validation/validation.component.html149 Modifier l'observation Modifier l'observation - - app/programs/observations/modalflow/steps/committed/committed.component.html - 56 - + Upddate obs btn - + app/programs/observations/modalflow/steps/committed/committed.component.html37 Annuler @@ -574,99 +533,77 @@ Cancel - app/programs/observations/modalflow/steps/committed/committed.component.html59app/programs/observations/validation/validation.component.html213 + app/programs/observations/modalflow/steps/committed/committed.component.html40app/programs/observations/validation/validation.component.html153 Félicitations !Félicitations ! - - app/programs/observations/modalflow/steps/congrats/congrats.component.html - 24 - - - app/programs/observations/modalflow/steps/reward/reward.component.html - 11 - + + Congrats - + app/programs/observations/modalflow/steps/congrats/congrats.component.html16app/programs/observations/modalflow/steps/reward/reward.component.html6 Votre observation a bien été ajoutée ! Votre observation a bien été ajoutée ! - - app/programs/observations/modalflow/steps/congrats/congrats.component.html - 25 - + Congrats message - + app/programs/observations/modalflow/steps/congrats/congrats.component.html17 Observé par le Observé par le - - app/programs/observations/modalflow/steps/congrats/congrats.component.html - 30 - + Obs date and observer - + app/programs/observations/modalflow/steps/congrats/congrats.component.html21 - - app/programs/observations/modalflow/steps/reward/reward.component.html - 12 - + New reward message - + app/programs/observations/modalflow/steps/reward/reward.component.html7 {VAR_PLURAL, plural, =1 {Vous venez d'obtenir ce badge } other {Vous venez d'obtenir ces badges } }{VAR_PLURAL, plural, =1 {Vous venez d'obtenir ce badge } other {Vous venez d'obtenir ces badges } } - - app/programs/observations/modalflow/steps/reward/reward.component.html - 13 - - + + app/programs/observations/modalflow/steps/reward/reward.component.html8 Aucune photoAucune photo - - app/programs/media-galery/media-galery.component.html - 17 - + No medias - + app/programs/media-galery/media-galery.component.html18 Toutes espècesToutes espèces All species select option - app/programs/observations/list/list.component.html14 + app/programs/observations/list/list.component.html8 Toutes communesToutes communes All municipalities select option - app/programs/observations/list/list.component.html40 + app/programs/observations/list/list.component.html22 - Tout statuts de validation - - Tout statuts de validation - - - app/programs/observations/list/list.component.html - 57 - + Tous statuts de validation + + Tous statuts de validation + + All validation status select option - + app/programs/observations/list/list.component.html33 - Mes Observations à valider - Mes Observations à valider - + Mes + Observations à valider   + Mes + Observations à valider   + My obs - app/programs/observations/list/list.component.html67 + app/programs/observations/list/list.component.html43 Veuillez zoomer pour localiser votre observation.Veuillez zoomer pour localiser votre observation. @@ -714,225 +651,164 @@ logout logout - app/auth/logout/logout.component.html3app/auth/logout/logout.component.html16app/core/topbar/topbar.component.html137 + app/auth/logout/logout.component.html3app/auth/logout/logout.component.html16app/core/topbar/topbar.component.html64 AccueilAccueil - - app/core/topbar/topbar.component.html - 51 - + home - + app/core/topbar/topbar.component.html19 A proposA propos - - app/core/topbar/topbar.component.html - 75 - + about - + app/core/topbar/topbar.component.html33 Admin Admin - - app/core/topbar/topbar.component.html - 86 - + admin - + app/core/topbar/topbar.component.html37 ValidationValidation - - app/core/topbar/topbar.component.html - 97 - + validation - + app/core/topbar/topbar.component.html43 Mon tableau de bordMon tableau de bord my Dasboard Link - app/core/topbar/topbar.component.html113 + app/core/topbar/topbar.component.html54 Mes badgesMes badges - - app/auth/user-dashboard/user-dashboard.component.html - 60 - + My badges - + app/auth/user-dashboard/user-dashboard.component.html40 Récompenses géneral Récompenses géneral - - app/auth/user-dashboard/user-dashboard.component.html - 65 - + General Awards - + app/auth/user-dashboard/user-dashboard.component.html42 - Exporter mes données personnellesExporter mes données personnelles - - app/auth/user-dashboard/user-dashboard.component.html - 185 - + Exporter mes données + personnellesExporter mes données + personnelles + Export personnal data btn - + app/auth/user-dashboard/user-dashboard.component.html82 - Exporter mes observationsExporter mes observations - - app/auth/user-dashboard/user-dashboard.component.html - 195 - + Exporter mes + observationsExporter mes + observations + Export personnal observations btn - + app/auth/user-dashboard/user-dashboard.component.html87 Exporter mes sitesExporter mes sites - - app/auth/user-dashboard/user-dashboard.component.html - 205 - + Export personnal sites btn - + app/auth/user-dashboard/user-dashboard.component.html92 - Supprimer mon compteSupprimer mon compte - - app/auth/user-dashboard/user-dashboard.component.html - 214 - + Supprimer mon + compteSupprimer mon + compte + Delete Account - + app/auth/user-dashboard/user-dashboard.component.html95 Mettre à jour vos données personnelles Mettre à jour vos données personnelles - - app/auth/user-dashboard/user-dashboard.component.html - 231 - + Update personnal data - + app/auth/user-dashboard/user-dashboard.component.html112 Entrez votre nom d'utilisateurEntrez votre nom d'utilisateur - - app/auth/user-dashboard/user-dashboard.component.html - 296 - + your username placeholder - + app/auth/user-dashboard/user-dashboard.component.html146 Votre email *Votre email * - - app/auth/user-dashboard/user-dashboard.component.html - 306 - + your email label - + app/auth/user-dashboard/user-dashboard.component.html152 Votre prénom *Votre prénom * - - app/auth/user-dashboard/user-dashboard.component.html - 334 - + your first name - + app/auth/user-dashboard/user-dashboard.component.html168 Entrez votre prénomEntrez votre prénom - - app/auth/user-dashboard/user-dashboard.component.html - 344 - + your first name placeholder - + app/auth/user-dashboard/user-dashboard.component.html172 Votre nom *Votre nom * - - app/auth/user-dashboard/user-dashboard.component.html - 353 - + your surname label - + app/auth/user-dashboard/user-dashboard.component.html177 Entrez votre nomEntrez votre nom - - app/auth/user-dashboard/user-dashboard.component.html - 363 - + your surname placeholder - + app/auth/user-dashboard/user-dashboard.component.html181 Les mots de passe diffèrent. Les mots de passe diffèrent. - - app/auth/user-dashboard/user-dashboard.component.html - 377 - + error different passwords - + app/auth/user-dashboard/user-dashboard.component.html189 - Votre nouveau mot de passeVotre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 386 - + Votre nouveau mot de + passeVotre nouveau mot de + passe + your password label - + app/auth/user-dashboard/user-dashboard.component.html195 Votre nouveau mot de passeVotre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 397 - + your password placeholder - + app/auth/user-dashboard/user-dashboard.component.html200 Confirmez votre nouveau mot de passeConfirmez votre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 409 - + your password confirm label - + app/auth/user-dashboard/user-dashboard.component.html208 Votre nouveau mot de passeVotre nouveau mot de passe - - app/auth/user-dashboard/user-dashboard.component.html - 419 - + your password confirm placeholder - + app/auth/user-dashboard/user-dashboard.component.html212 Mettre à jour Mettre à jour - - app/auth/user-dashboard/user-dashboard.component.html - 441 - + update personnal data btn - + app/auth/user-dashboard/user-dashboard.component.html226 vous allez être redirigé automatiquement sur la page d'accueilvous allez être redirigé automatiquement sur la page d'accueil diff --git a/frontend/src/i18n/messages.xlf b/frontend/src/i18n/messages.xlf index 66cc6fb0..745e8a65 100644 --- a/frontend/src/i18n/messages.xlf +++ b/frontend/src/i18n/messages.xlf @@ -243,7 +243,7 @@ app/core/topbar/topbar.component.html - 154 + 74 Create account @@ -253,7 +253,7 @@ app/auth/register/register.component.html - 31 + 15 Unable to valid email @@ -261,11 +261,11 @@ Votre pseudonyme app/auth/register/register.component.html - 58 + 33 app/auth/user-dashboard/user-dashboard.component.html - 280 + 137 Your pseudo @@ -273,7 +273,7 @@ Entrez votre pseudonyme app/auth/register/register.component.html - 71 + 40 Enter your pseudo @@ -281,7 +281,7 @@ Votre email app/auth/register/register.component.html - 82 + 47 Your email form label @@ -289,11 +289,11 @@ Entrez votre email app/auth/register/register.component.html - 95 + 54 app/auth/user-dashboard/user-dashboard.component.html - 322 + 160 Your email input placeholder label @@ -301,11 +301,11 @@ Votre prénom app/auth/register/register.component.html - 110 + 64 app/auth/register/register.component.html - 117 + 66 your first name @@ -313,7 +313,7 @@ Votre nom app/auth/register/register.component.html - 127 + 72 your last name label @@ -321,17 +321,27 @@ Entrez votre nom app/auth/register/register.component.html - 134 + 74 Enter your last name + + + Doit contenir au moins un chiffre et une lettre majuscule et minuscule, et au moins 8 caractères. + + + app/auth/register/register.component.html + 81 + + Strong password required + - Les mots de passe diffèrent. - + Les mots de passe diffèrent. + app/auth/register/register.component.html - 152 + 85 Different password error @@ -339,7 +349,7 @@ Votre mot de passe app/auth/register/register.component.html - 158 + 92 Your password label @@ -347,7 +357,7 @@ Votre mot de passe app/auth/register/register.component.html - 164 + 94 Your password input @@ -355,14 +365,14 @@ Confirmez votre mot de passe app/auth/register/register.component.html - 177 + 101 Confirmez le mot de passe app/auth/register/register.component.html - 187 + 105 Your confirm password input @@ -372,7 +382,7 @@ app/auth/register/register.component.html - 201 + 114 Accept UGC @@ -380,7 +390,7 @@ conditions d'utilisation app/auth/register/register.component.html - 218 + 121 Use condition @@ -390,7 +400,7 @@ app/auth/register/register.component.html - 234 + 132 register link @@ -400,7 +410,7 @@ app/auth/register/register.component.html - 245 + 137 app/auth/login/login.component.html @@ -408,7 +418,7 @@ app/programs/media-galery/media-galery.component.html - 49 + 50 close modal @@ -424,7 +434,7 @@ app/core/topbar/topbar.component.html - 147 + 70 login @@ -506,7 +516,7 @@ S'incrire et contribuer au site app/programs/observations/modalflow/steps/onboard/onboard.component.html - 35 + 24 register and contribute @@ -514,15 +524,17 @@ Continuer sans s'enregistrer app/programs/observations/modalflow/steps/onboard/onboard.component.html - 44 + 30 continue unregistered - Vous avez déjà un compte ? Connectez-vous ! + Vous + avez déjà un compte ? + Connectez-vous ! app/programs/observations/modalflow/steps/onboard/onboard.component.html - 51 + 36 Invite to login @@ -532,7 +544,7 @@ app/programs/observations/form/form.component.html - 127 + 91 Additional information @@ -540,11 +552,11 @@ Date de l'observation app/programs/observations/form/form.component.html - 136 + 97 app/programs/observations/validation/validation.component.html - 140 + 99 observation date @@ -552,7 +564,7 @@ jj/mm/aaaa app/programs/observations/form/form.component.html - 144 + 99 expected date format @@ -561,7 +573,7 @@ Dénombrement app/programs/observations/form/form.component.html - 156 + 104 Enumeration Label @@ -569,7 +581,7 @@ Nombre app/programs/observations/form/form.component.html - 163 + 106 Enumeration Placeholder @@ -578,11 +590,11 @@ Commentaire app/programs/observations/form/form.component.html - 187 + 117 app/programs/observations/validation/validation.component.html - 161 + 113 Comment Input Label @@ -590,11 +602,11 @@ Votre commentaire app/programs/observations/form/form.component.html - 192 + 119 app/programs/observations/validation/validation.component.html - 168 + 116 Comment Input Placeholder @@ -603,11 +615,11 @@ Photos existantes (cocher pour supprimer) app/programs/observations/form/form.component.html - 202 + 124 app/programs/sites/form/form.component.html - 51 + 35 Existing Photos @@ -615,7 +627,7 @@ Ajouter une photo app/programs/observations/form/form.component.html - 221 + 132 Add photo @@ -625,7 +637,7 @@ app/programs/observations/form/form.component.html - 232 + 140 observation Location @@ -637,14 +649,14 @@ app/programs/observations/form/form.component.html - 240 + 145 Veuillez zoomer pour localiser votre observation. app/programs/observations/form/form.component.html - 259 + 158 app/programs/sites/siteform/siteform.component.html @@ -652,17 +664,19 @@ app/programs/observations/validation/validation.component.html - 154 + 110 Zooming instruction - Cliquez sur la carte pour renseigner le lieu précis de + Cliquez sur + la carte pour renseigner le lieu + précis de votre observation app/programs/observations/form/form.component.html - 272 + 163 click on map instruction @@ -671,7 +685,7 @@ app/programs/observations/form/form.component.html - 299 + 178 Contact email input label @@ -679,7 +693,7 @@ E-Mail app/programs/observations/form/form.component.html - 306 + 182 Contact email input @@ -691,7 +705,7 @@ app/programs/observations/form/form.component.html - 319 + 189 Missing fields alert @@ -705,15 +719,15 @@ app/programs/observations/obs.component.html - 73 + 74 app/programs/observations/obs.component.html - 73 + 74 app/programs/observations/obs.component.html - 73 + 74 Update obs @@ -723,11 +737,11 @@ app/programs/observations/modalflow/steps/committed/committed.component.html - 46 + 32 app/programs/observations/validation/validation.component.html - 210 + 149 Valid obs btn @@ -737,7 +751,7 @@ app/programs/observations/modalflow/steps/committed/committed.component.html - 56 + 37 Upddate obs btn @@ -747,11 +761,11 @@ app/programs/observations/modalflow/steps/committed/committed.component.html - 59 + 40 app/programs/observations/validation/validation.component.html - 213 + 153 Cancel @@ -759,11 +773,11 @@ Félicitations ! app/programs/observations/modalflow/steps/congrats/congrats.component.html - 24 + 16 app/programs/observations/modalflow/steps/reward/reward.component.html - 11 + 6 Congrats @@ -773,7 +787,7 @@ app/programs/observations/modalflow/steps/congrats/congrats.component.html - 25 + 17 Congrats message @@ -782,7 +796,7 @@ le app/programs/observations/modalflow/steps/congrats/congrats.component.html - 30 + 21 Obs date and observer @@ -792,7 +806,7 @@ app/programs/observations/modalflow/steps/reward/reward.component.html - 12 + 7 New reward message @@ -801,34 +815,34 @@ ce badge } other {Vous venez d'obtenir ces badges } } app/programs/observations/modalflow/steps/reward/reward.component.html - 13 + 8 Aucune photo app/programs/media-galery/media-galery.component.html - 17 + 18 No medias - Toutes espèces - + Toutes espèces + app/programs/observations/list/list.component.html - 14 + 8 All species select option - Toutes communes - + Toutes communes + app/programs/observations/list/list.component.html - 40 + 22 All municipalities select @@ -836,20 +850,21 @@ - Tout statuts de validation - + Tous statuts de validation + app/programs/observations/list/list.component.html - 57 + 33 All validation status select option - Mes Observations à valider - + Mes + Observations à valider   + app/programs/observations/list/list.component.html - 67 + 43 My obs @@ -929,7 +944,7 @@ app/core/topbar/topbar.component.html - 137 + 64 logout logout @@ -938,7 +953,7 @@ Accueil app/core/topbar/topbar.component.html - 51 + 19 home @@ -946,7 +961,7 @@ A propos app/core/topbar/topbar.component.html - 75 + 33 about @@ -955,7 +970,7 @@ app/core/topbar/topbar.component.html - 86 + 37 admin @@ -963,7 +978,7 @@ Validation app/core/topbar/topbar.component.html - 97 + 43 validation @@ -971,7 +986,7 @@ Mon tableau de bord app/core/topbar/topbar.component.html - 113 + 54 my Dasboard Link @@ -979,7 +994,7 @@ Mes badges app/auth/user-dashboard/user-dashboard.component.html - 60 + 40 My badges @@ -989,23 +1004,25 @@ app/auth/user-dashboard/user-dashboard.component.html - 65 + 42 General Awards - Exporter mes données personnelles + Exporter mes données + personnelles app/auth/user-dashboard/user-dashboard.component.html - 185 + 82 Export personnal data btn - Exporter mes observations + Exporter mes + observations app/auth/user-dashboard/user-dashboard.component.html - 195 + 87 Export personnal observations btn @@ -1013,15 +1030,16 @@ Exporter mes sites app/auth/user-dashboard/user-dashboard.component.html - 205 + 92 Export personnal sites btn - Supprimer mon compte + Supprimer mon + compte app/auth/user-dashboard/user-dashboard.component.html - 214 + 95 Delete Account @@ -1031,7 +1049,7 @@ app/auth/user-dashboard/user-dashboard.component.html - 231 + 112 Update personnal data @@ -1039,7 +1057,7 @@ Entrez votre nom d'utilisateur app/auth/user-dashboard/user-dashboard.component.html - 296 + 146 your username @@ -1049,7 +1067,7 @@ Votre email * app/auth/user-dashboard/user-dashboard.component.html - 306 + 152 your email label @@ -1057,7 +1075,7 @@ Votre prénom * app/auth/user-dashboard/user-dashboard.component.html - 334 + 168 your first name @@ -1065,7 +1083,7 @@ Entrez votre prénom app/auth/user-dashboard/user-dashboard.component.html - 344 + 172 your first name @@ -1075,7 +1093,7 @@ Votre nom * app/auth/user-dashboard/user-dashboard.component.html - 353 + 177 your surname label @@ -1083,7 +1101,7 @@ Entrez votre nom app/auth/user-dashboard/user-dashboard.component.html - 363 + 181 your surname @@ -1095,15 +1113,16 @@ app/auth/user-dashboard/user-dashboard.component.html - 377 + 189 error different passwords - Votre nouveau mot de passe + Votre nouveau mot de + passe app/auth/user-dashboard/user-dashboard.component.html - 386 + 195 your password label @@ -1111,7 +1130,7 @@ Votre nouveau mot de passe app/auth/user-dashboard/user-dashboard.component.html - 397 + 200 your password @@ -1121,7 +1140,7 @@ Confirmez votre nouveau mot de passe app/auth/user-dashboard/user-dashboard.component.html - 409 + 208 your password confirm @@ -1131,7 +1150,7 @@ Votre nouveau mot de passe app/auth/user-dashboard/user-dashboard.component.html - 419 + 212 your password confirm @@ -1143,7 +1162,7 @@ app/auth/user-dashboard/user-dashboard.component.html - 441 + 226 update personnal data btn diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 1c65da1a..89d07e38 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -24,5 +24,8 @@ "lib": ["es2018", "dom"], "resolveJsonModule": true, "esModuleInterop": true + }, + "angularCompilerOptions": { + "strictTemplates": true } }