Merge branch 'new_signup' into 'master'

New signup

See merge request !90

src/app/members/account/edit-data/edit-data.component.html

@@ -112,14 +112,14 @@
           <p class="text-center">Informations parentales</p>  
           <div class="form-group">
             <mat-form-field class="horizontal-display">
-              <mat-label>Activité de la mère </mat-label> 
+              <mat-label>Activité du responsable légal 2 </mat-label> 
               <mat-select  formControlName="motherActivity" required>
                 <mat-option *ngFor="let activity of possibleParentsActivities" [value]="activity.id">{{ activity.name }}</mat-option>
               </mat-select>
             </mat-form-field>
       
             <mat-form-field class="horizontal-display">
-              <mat-label>Activité du père </mat-label>
+              <mat-label>Activité du responsable légal 1 </mat-label>
               <mat-select  formControlName="fatherActivity" required>
                 <mat-option *ngFor="let activity of possibleParentsActivities" [value]="activity.id">{{ activity.name }}</mat-option>
               </mat-select> 
@@ -128,7 +128,7 @@
           
           <div class="form-group">
             <mat-form-field class="horizontal-display">
-              <mat-label>Statut des parents </mat-label>
+              <mat-label>Statut des responsables légaux </mat-label>
               <mat-select formControlName="parentsStatus" required >
                 <mat-option *ngFor="let status of possibleParentsStatus" [value]="status.id">{{ status.name }}</mat-option>
               </mat-select>

src/app/members/account/edit-data/edit-data.component.ts

@@ -39,10 +39,10 @@ export class EditDataComponent implements OnInit {
 
 
   public possibleParentsStatus = [
-    { id: "maried", name: "Vos parents vivent ensemble" },
-    { id: "separated", name: "Vos parents vivent séparément" },
-    { id: "monoparental", name: "Vous avez un seul parent" },
-    { id: "noparents", name: "Vous ne dépendez pas de vos parents" },
+    { id: "maried", name: "Ils vivent ensemble" },
+    { id: "separated", name: "Ils vivent séparément" },
+    { id: "monoparental", name: "Vous n'en avez qu'un seul" },
+    { id: "noparents", name: "Autre" },
   ]
 
   public possibleParentsActivities = [