Download as
Browse Code »

Commit 43a11c8c626e8005441754514132667df8659bd0

Authored by Antonio Terceiro
1 parent 8bdc8233
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

Fix syntax error in Ruby 1.9 (again)

Showing 1 changed file with 4 additions and 2 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @43a11c8
@@ -18,8 +18,10 @@ class User < ActiveRecord::Base @@ -18,8 +18,10 @@ class User < ActiveRecord::Base
18 # FIXME ugly workaround 18 # FIXME ugly workaround
19 def self.human_attribute_name(attrib) 19 def self.human_attribute_name(attrib)
20 case attrib.to_sym 20 case attrib.to_sym
21 - when :login: return [_('Username'), _('Email')].join(' / ')  
22 - when :email: return _('e-Mail') 21 + when :login
  22 + return [_('Username'), _('Email')].join(' / ')
  23 + when :email
  24 + return _('e-Mail')
23 else _(self.superclass.human_attribute_name(attrib)) 25 else _(self.superclass.human_attribute_name(attrib))
24 end 26 end
25 end 27 end