diff options
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/templates/mailer.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb index 7343eb28b3..21e5918ecb 100644 --- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb +++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb @@ -5,7 +5,7 @@ class <%= class_name %> < ActionMailer::Base # Subject can be set in your I18n file at config/locales/en.yml # with the following lookup: # - # en.actionmailer.<%= file_name %>.<%= action %>.subject + # en.<%= file_name %>.<%= action %>.subject # def <%= action %> @greeting = "Hi" diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index f4990bfb4c..41aecea355 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -327,7 +327,7 @@ module Rails paths = [] namespaces.each do |namespace| pieces = namespace.split(":") - paths << pieces.dup.push(pieces.last).join("/") unless pieces.uniq.size == 1 + paths << pieces.dup.push(pieces.last).join("/") paths << pieces.join("/") end paths.uniq! diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 850b45ff74..450dec7716 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -17,8 +17,8 @@ class MailerGeneratorTest < Rails::Generators::TestCase def test_mailer_with_i18n_helper run_generator assert_file "app/mailers/notifier.rb" do |mailer| - assert_match /en\.actionmailer\.notifier\.foo\.subject/, mailer - assert_match /en\.actionmailer\.notifier\.bar\.subject/, mailer + assert_match /en\.notifier\.foo\.subject/, mailer + assert_match /en\.notifier\.bar\.subject/, mailer end end |