From 67d026a8a086c248ff81a71505ab1ffc1d873b58 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Thu, 1 Apr 2021 16:38:00 +0200
Subject: [PATCH] adaption registration (ref #220)

---
 .../src/Cadoles/CoreBundle/Form/RegistrationType.php         | 3 ++-
 .../src/Cadoles/CoreBundle/Form/ResetpwdType.php             | 3 ++-
 src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php    | 3 ++-
 .../CoreBundle/Resources/views/Registration/edit.html.twig   | 5 ++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php
index ad8aead0..1b3d9a81 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php
@@ -110,7 +110,8 @@ class RegistrationType extends AbstractType
                     "type" => PasswordType::class,
                     "required" => ($options["mode"]=="submit"?true:false),
                     "first_options"  => array("label" => "Mot de Passe","attr" => array("class" => "form-control", "style" => "margin-bottom:15px", "autocomplete" => "new-password")),
-                    "second_options" => array('label' => 'Confirmer Mot de Passe',"attr" => array("class" => "form-control", "style" => "margin-bottom:15px"))
+                    "second_options" => array('label' => 'Confirmer Mot de Passe',"attr" => array("class" => "form-control", "style" => "margin-bottom:15px")),
+                    "invalid_message" => "Mot de passe non valide"
                 )
             );
             
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ResetpwdType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ResetpwdType.php
index e9d96e39..f7e91161 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ResetpwdType.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ResetpwdType.php
@@ -45,7 +45,8 @@ class ResetpwdType extends AbstractType
                     "required" => ($options["mode"]=="submit"?true:false),
                     "options" => array("always_empty" => true),
                     "first_options"  => array("label" => "Votre nouveau Mot de Passe","attr" => array("class" => "form-control", "style" => "margin-bottom:15px")),
-                    "second_options" => array('label' => 'Confirmer votre nouveau Mot de Passe',"attr" => array("class" => "form-control", "style" => "margin-bottom:15px"))
+                    "second_options" => array('label' => 'Confirmer votre nouveau Mot de Passe',"attr" => array("class" => "form-control", "style" => "margin-bottom:15px")),
+                    "invalid_message" => "Mot de passe non valide"
                 )
             );        
         }
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php
index 5a6d8950..7fc87385 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php
@@ -141,7 +141,8 @@ class UserType extends AbstractType
                     "required" => ($options["mode"]=="submit"?true:false),
                     "options" => array("always_empty" => true),
                     "first_options"  => array("label" => "Mot de Passe","attr" => array("class" => "form-control", "style" => "margin-bottom:15px", "autocomplete" => "new-password")),
-                    "second_options" => array('label' => 'Confirmer Mot de Passe',"attr" => array("class" => "form-control", "style" => "margin-bottom:15px"))
+                    "second_options" => array('label' => 'Confirmer Mot de Passe',"attr" => array("class" => "form-control", "style" => "margin-bottom:15px")),
+                    "invalid_message" => "Mot de passe non valide"
                 )
             );
         }
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig
index 0e79038c..ec426bbe 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig
@@ -110,9 +110,8 @@
                         {% if form.email is defined %} 
                             {{ form_row(form.email) }} 
                             <div class='alert alert-info alert-email' style='display:none; font-size: 80%;padding: 5px;margin-top: -10px;'>
-                                Attention, le suffixe de votre adresse mail n’est pas dans la liste des administrations autorisées.<br>
-                                Merci de bien vouloir privilégier votre adresse professionnelle si vous en avez une.<br>
-                                Si ce n’est pas le cas, il faut que vous renseigniez la case motivation de votre demande.
+                                Votre mail ne fait pas partie des mails professonniels pré-inscrits dans {{app.session.get("appname")}}.<br>
+                                S'il s'agit de votre mail professionnel vous devez compléter le formulaire "Motivations" pour que l'administrateur de {{app.session.get("appname")}} valide votre demannde d'inscription.
                             </div>                            
                         {% endif %}
                         {% if form.visible is defined %} {{ form_row(form.visible) }} {% endif %}