Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2014-10-14 15:16:45 +0400
committerJonne Haß <me@jhass.eu>2014-10-14 15:17:57 +0400
commitb9cad8485d3ef28b42bd2d4f2d19fb13d42d1b60 (patch)
tree19ddbbe19465cae4802bbb2b2df4ec7649067fe4 /app
parentb4e4b7f007782b8df111054f3d33abaf04f5973a (diff)
parent140022875765351b67e9cbcf927bc173252f9e55 (diff)
Merge pull request #5318 from gdpelican/feature/fix-missing-password-translation
Fix missing password translations
Diffstat (limited to 'app')
-rw-r--r--app/views/passwords/edit.mobile.haml8
-rw-r--r--app/views/passwords/new.mobile.haml8
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/passwords/edit.mobile.haml b/app/views/passwords/edit.mobile.haml
index db592f77c..18c97e636 100644
--- a/app/views/passwords/edit.mobile.haml
+++ b/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
diff --git a/app/views/passwords/new.mobile.haml b/app/views/passwords/new.mobile.haml
index ea60939b3..dee951b4e 100644
--- a/app/views/passwords/new.mobile.haml
+++ b/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?