Download as
Browse Code »

Commit 53a345b6bc10d528ccd5b48416a35ea5040acd71

Authored by Antonio Terceiro
1 parent 76d52555
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Cosmetic changes in change password/forgot password features

Showing 3 changed files with 17 additions and 22 deletions   Show diff stats
app/models/change_password.rb
  Diff comments   View file @53a345b
1   -# TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task
2   -
3   -# FIXME remove this workaround
4   -class HumanName
5   - def human_name
6   - @name
7   - end
8   - def initialize(name)
9   - @name = name
10   - end
11   -end
12   -
13 1 class ChangePassword < Task
14 2  
15 3 serialize :data, Hash
... ... @@ -17,15 +5,22 @@ class ChangePassword &lt; Task
17 5 self[:data] ||= {}
18 6 end
19 7  
20   - # FIXME ugly workaround
21   - self.columns_hash['login'] = HumanName.new _('Username')
22   - self.columns_hash['email'] = HumanName.new _('e-Mail')
23   -
24 8 attr_accessor :login, :email, :password, :password_confirmation
25   - N_('ChangePassword|Login')
26   - N_('ChangePassword|Email')
27   - N_('ChangePassword|Password')
28   - N_('ChangePassword|Password Confirmation')
  9 +
  10 + def self.human_attribute_name(attrib)
  11 + case attrib.to_sym
  12 + when :login:
  13 + _('Username')
  14 + when :email
  15 + _('e-Mail')
  16 + when :password
  17 + _('Password')
  18 + when :password_confirmation
  19 + _('Password Confirmation')
  20 + else
  21 + _(self.superclass.human_attribute_name(attrib))
  22 + end
  23 + end
29 24  
30 25 ###################################################
31 26 # validations for creating a ChangePassword task
... ...
app/views/account/change_password.rhtml
  Diff comments   View file @53a345b
... ... @@ -11,7 +11,7 @@
11 11 <p><label for="password_confirmation"><%= _('Confirm your new Password') %></label><br/>
12 12 <%= password_field_tag :new_password_confirmation %></p>
13 13  
14   -<%= submit_tag _('Change password') %>
  14 +<%= submit_button :ok, _('Change password') %>
15 15  
16 16 <% end %>
17 17  
... ...
app/views/account/new_password.rhtml
  Diff comments   View file @53a345b
... ... @@ -11,7 +11,7 @@
11 11 <%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
12 12 <%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
13 13 <% button_bar do %>
14   - <%= submit_button('change_password', _('Change password')) %>
  14 + <%= submit_button(:ok, _('Change password')) %>
15 15 <% end %>
16 16  
17 17 <% end %>
... ...