Download as
Browse Code »

Commit 8512674f250eb38cc198ea8073a3b83ebd8a7334

Authored by AntonioTerceiro
1 parent 99342898
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem280: marking TODO to remove ugly hacks 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1686 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 0 deletions   Show diff stats
app/models/change_password.rb
  Diff comments   View file @8512674
1 # TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task 1 # TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task
2 2
  3 +# FIXME remove this workaround
3 class HumanName 4 class HumanName
4 def human_name 5 def human_name
5 @name 6 @name
@@ -16,6 +17,7 @@ class ChangePassword < Task @@ -16,6 +17,7 @@ class ChangePassword < Task
16 self[:data] ||= {} 17 self[:data] ||= {}
17 end 18 end
18 19
  20 + # FIXME ugly workaround
19 self.columns_hash['login'] = HumanName.new _('Username') 21 self.columns_hash['login'] = HumanName.new _('Username')
20 self.columns_hash['email'] = HumanName.new _('e-Mail') 22 self.columns_hash['email'] = HumanName.new _('e-Mail')
21 23
app/models/user.rb
  Diff comments   View file @8512674
@@ -7,6 +7,7 @@ class User < ActiveRecord::Base @@ -7,6 +7,7 @@ class User < ActiveRecord::Base
7 N_('User|Password') 7 N_('User|Password')
8 N_('User|Password confirmation') 8 N_('User|Password confirmation')
9 9
  10 + # FIXME ugly workaround
10 def self.human_attribute_name(attrib) 11 def self.human_attribute_name(attrib)
11 case attrib.to_sym 12 case attrib.to_sym
12 when :login: return _('Username') 13 when :login: return _('Username')