diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 10:43:24 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 10:43:24 -0700 |
| commit | a9398a7da4fa845a0182bd53273c607dae55b1ee (patch) | |
| tree | d3b3f2f95a45ce19f10b774d6d07b41b318afa99 /actionmailer/lib | |
| parent | c6bd8a9d3ac2ebd5d0af4573d6d799085ac2219b (diff) | |
| parent | 2d8396fc9fbea9189e9e945e41e643925da5b2cb (diff) | |
| download | rails-a9398a7da4fa845a0182bd53273c607dae55b1ee.tar.gz rails-a9398a7da4fa845a0182bd53273c607dae55b1ee.tar.bz2 rails-a9398a7da4fa845a0182bd53273c607dae55b1ee.zip | |
Merge pull request #5716 from jurriaan/tr-gsub-cleanup
Updated/changed unneeded tr/gsubs
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/templates/mailer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 4af2d0a4a8..c508512ff6 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -696,7 +696,7 @@ module ActionMailer #:nodoc: # If it does not find a translation for the +subject+ under the specified scope it will default to a # humanized version of the <tt>action_name</tt>. def default_i18n_subject #:nodoc: - mailer_scope = self.class.mailer_name.gsub('/', '.') + mailer_scope = self.class.mailer_name.tr('/', '.') I18n.t(:subject, :scope => [mailer_scope, action_name], :default => action_name.humanize) end diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb index f6ed7cf8ac..edcfb4233d 100644 --- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb +++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb @@ -6,7 +6,7 @@ class <%= class_name %> < ActionMailer::Base # Subject can be set in your I18n file at config/locales/en.yml # with the following lookup: # - # en.<%= file_path.gsub("/",".") %>.<%= action %>.subject + # en.<%= file_path.tr("/",".") %>.<%= action %>.subject # def <%= action %> @greeting = "Hi" |