Refs #5670 Fix I18n on user registration views

3 files changed, 16 insertions, 12 deletions

diff --git a/app/views/devise/invitations/edit.html.slim b/app/views/devise/invitations/edit.html.slim
index 7a22146c0..20c2f15c8 100644
--- a/app/views/devise/invitations/edit.html.slim
+++ b/app/views/devise/invitations/edit.html.slim
@@ -1,6 +1,5 @@
 / PageHeader
-
-- content_for :page_header_title, t('.title')
+- content_for :page_header_title, t('devise.registrations.edit.title')
 
 / PageContent
 .page_content
@@ -16,4 +15,4 @@
                 = form.input :password, as: :password
                 = form.input :password_confirmation, as: :password
 
-            = form.button :submit, value: t('devise.invitations.edit.submit_button'), class: 'btn-info btn-default formSubmitr', form: 'invitation_form'
+            = form.button :submit, value: t('actions.submit'), class: 'btn-info btn-default formSubmitr', form: 'invitation_form'
diff --git a/app/views/devise/invitations/new.html.slim b/app/views/devise/invitations/new.html.slim
index 87bfbf750..90f086c2b 100644
--- a/app/views/devise/invitations/new.html.slim
+++ b/app/views/devise/invitations/new.html.slim
@@ -1,10 +1,15 @@
-h2 = t('devise.invitations.new.header')
+- content_for :page_header_title, t('devise.registrations.new.title')
 
-= simple_form_for resource, as: resource_name, :url => invitation_path(resource_name), :html => {:method => :post, class: "form-horizontal"} do |form|
-  = form.input :organisation_id, :as => :hidden, input_html: { :value => current_organisation.id }
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = simple_form_for resource, as: resource_name, :url => invitation_path(resource_name), :html => {:method => :post, class: "form-horizontal", id: "new_user_form"} do |form|
+          = form.input :organisation_id, :as => :hidden, input_html: { :value => current_organisation.id }
 
-  - resource.class.invite_key_fields.each do |field|
-    = form.input field
+          - resource.class.invite_key_fields.each do |field|
+            = form.input field
 
-  .form-actions
-    = form.button :submit, value: t('devise.invitations.new.submit_button'), class: 'btn-info'
\ No newline at end of file
+          .form-actions
+            = form.button :submit, value: t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'new_user_form'
\ No newline at end of file
diff --git a/spec/features/users/user_edit_spec.rb b/spec/features/users/user_edit_spec.rb
index 14995d8e5..020a4bc57 100644
--- a/spec/features/users/user_edit_spec.rb
+++ b/spec/features/users/user_edit_spec.rb
@@ -40,8 +40,8 @@ feature 'User edit', :devise do
     other = FactoryGirl.create(:user, email: 'other@example.com')
     login_as(me, :scope => :user)
     visit edit_user_registration_path(other)
-    expect(page).to have_content 'Votre Profil'
-    expect(page).to have_field('Email', with: me.email)
+    expect(page).to have_content I18n.t('devise.registrations.edit.title')
+    expect(page).to have_field(I18n.t('simple_form.labels.user.email'), with: me.email)
   end
 
 end