github/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-04-28 03:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2206 from tigris/mailer_subject_rename

Browse Source 
Rename Devise::Mailer.translate() to something more inline with what it does
This commit is contained in:
José Valim
2013-01-10 04:19:57 -08:00
parent b6a7d11e5a d48414b0a5
commit bd9bf326c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/devise/mailers/helpers.rb
View File

@@ -27,7 +27,7 @@ module Devise
def headers_for(action, opts)
headers = {
:subject => translate(devise_mapping, action),
:subject => subject_for(action),
:to => resource.email,
:from => mailer_sender(devise_mapping),
:reply_to => mailer_reply_to(devise_mapping),
@@ -86,8 +86,8 @@ module Devise
# confirmation_instructions:
# subject: '...'
#
def translate(mapping, key)
I18n.t(:"#{mapping.name}_subject", :scope => [:devise, :mailer, key],
def subject_for(key)
I18n.t(:"#{devise_mapping.name}_subject", :scope => [:devise, :mailer, key],
:default => [:subject, key.to_s.humanize])
end
end