Merge pull request #5318 from gdpelican/feature/fix-missing-password-translation

Fix missing password translations

Changelog.md

@@ -68,6 +68,7 @@ The keys will still be available in the root level within the 0.5 release. The o
 * Fix pagination for people/guid/contacts [#5304](https://github.com/diaspora/diaspora/pull/5304)
 * Fix poll creation on Bootstrap pages [#5334](https://github.com/diaspora/diaspora/pull/5334)
 * Show error message on invalid reset password attempt [#5325](https://github.com/diaspora/diaspora/pull/5325)
+* Fix translations on mobile password reset pages [#5318](https://github.com/diaspora/diaspora/pull/5318)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

app/views/passwords/edit.mobile.haml

@@ -10,20 +10,20 @@
         = f.hidden_field :reset_password_token
         %fieldset
           %legend
-            =t('.change_password')
+            =t('devise.passwords.edit.change_password')
 
           .control-group
-            = f.label :password, t('password'), :class => "control-label"
+            = f.label :password, t('devise.passwords.edit.new_password'), :class => "control-label"
             .controls
               = f.password_field :password
 
           .control-group
-            = f.label :password_confirmation, t('password_confirmation'), :class => "control-label"
+            = f.label :password_confirmation, t('devise.passwords.edit.confirm_password'), :class => "control-label"
             .controls
               = f.password_field :password_confirmation
 
           .controls
-            = f.submit t('.change_password'), :class => 'btn primary'
+            = f.submit t('devise.passwords.edit.change_password'), :class => 'btn primary'
 
 %footer
   = link_to t('layouts.application.toggle'), toggle_mobile_path

app/views/passwords/new.mobile.haml

@@ -8,17 +8,17 @@
       = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
         %fieldset
           %legend
-            =t('.forgot_password')
+            =t('devise.passwords.new.forgot_password')
           - unless devise_error_messages!.empty?
-            %i=  t('.no_account')
+            %i=  t('devise.passwords.new.no_account')
 
           .control-group
-            = f.label :email, t('email'), :class => "control-label"
+            = f.label :email, t('devise.passwords.new.email'), :class => "control-label"
             .controls
               = f.text_field :email
 
           .controls
-            = f.submit t('.send_password_instructions'), :class => 'btn'
+            = f.submit t('devise.passwords.new.send_password_instructions'), :class => 'btn'
 
 %footer
   - if display_registration_link?