Add spec for devise and upgrade versions of devise views

3 files changed, 37 insertions, 12 deletions

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 8177839bd..ce309ca84 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -280,7 +280,7 @@ end
 
 Rails.application.config.to_prepare do
   Devise::SessionsController.layout "devise"
-  Devise::RegistrationsController.layout proc{ |controller| ( action_name == "edit") ? "application" : "devise" }
+  Devise::RegistrationsController.layout proc{ |controller| ( action_name == "edit" || action_name == "update") ? "application" : "devise" }
   Devise::ConfirmationsController.layout "devise"
   Devise::UnlocksController.layout "devise"            
   Devise::PasswordsController.layout "devise"        
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index d5c545342..d4cf9c525 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -40,13 +40,28 @@ validating conformance of data wrt Neptune (French standard NFP 99 506)."
       sign_up: "Sign up"
       new_password: Forget your password ?
       new_confirmation: "Didn't receive confirmation instructions?"
-  helpers:
-    label:
+  simple_form:
+    labels:
       user:
         email: "Email"
-        organisation_name: "Organisation name"
+        organisation:
+          name: "Organisation name"
         name: Full name
         password: Password
         password_confirmation: Password confirmation
         current_password: Current password
         remember_me: Remember me
+    hints:
+      user:
+        edit:
+          password: "Leave it blank if you don't want to change it"
+          current_password: "We need your current password to confirm your changes"
+    placeholders:
+      user:
+        email: "Email"
+        organisation:
+          name: "Organisation name"
+        name: Full name
+        password: Password
+        password_confirmation: Password confirmation
+        current_password: Current password
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 929aa682a..5f4b5089a 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -1,11 +1,6 @@
 # Additional translations for devise forms
 
 fr:
-  activerecord:
-    attributes:
-      user:
-        password: Mot de passe
-        password_confirmation:  Confirmation du mot de passe
   devise:
     sessions:
       new:
@@ -46,13 +41,28 @@ norme Neptune (NFP 99 506)"
       sign_up: "S'inscrire"
       new_password: "Mot de passe oublié?"
       new_confirmation: "Vous n'avez pas reçu les instructions de confirmation ?"
-  helpers:
-    label:
+  simple_form:
+    labels:
       user:
         email: "Email"
-        organisation_name: "Nom de l'organisation"
+        organisation:
+          name: "Nom de l'organisation"
         name: Nom complet
         password: Mot de passe
         password_confirmation: Confirmation du mot de passe
         current_password: Mot de passe actuel
         remember_me: Se souvenir de moi
+    hints:
+      user:
+        edit:
+          password: 'Laissez le vide si vous ne voulez pas le changer'
+          current_password: "Nous avons besoin de votre mot de passe pour confirmer les changements"
+    placeholders:
+      user:
+        email: "Email"
+        organisation:
+          name: "Nom de l'organisation"
+        name: Nom complet
+        password: Mot de passe
+        password_confirmation: Confirmation du mot de passe
+        current_password: Mot de passe actuel