Download as
Browse Code »

Commit 5034abbbf3048fe63b8d343b58dd10998b3f2865

Authored by Rodrigo Souto
1 parent c6bf7b15
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Adding email to login label

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @5034abb
... ... @@ -15,7 +15,7 @@ class User < ActiveRecord::Base
15 15 # FIXME ugly workaround
16 16 def self.human_attribute_name(attrib)
17 17 case attrib.to_sym
18   - when :login: return _('Username')
  18 + when :login: return [_('Username'), _('Email')].join(' / ')
19 19 when :email: return _('e-Mail')
20 20 else _(self.superclass.human_attribute_name(attrib))
21 21 end
... ... @@ -116,7 +116,7 @@ class User < ActiveRecord::Base
116 116  
117 117 validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
118 118  
119   - # Authenticates a user by their login name and unencrypted password. Returns the user or nil.
  119 + # Authenticates a user by their login name or email and unencrypted password. Returns the user or nil.
120 120 def self.authenticate(login, password, environment = nil)
121 121 environment ||= Environment.default
122 122 u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
... ...