diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-09 09:22:25 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-09 09:22:25 -0700 |
commit | bf2c43983cde2482106a93786a05d3030c08f074 (patch) | |
tree | 3672b2d9af5ae3a9fdc9aaea8138488da16b64dc /railties/lib/rails | |
parent | 7fcbbafe1ab9d9d81483591b031f7f44e0a55cd3 (diff) | |
parent | fbfea9e98dda97f2bf03d69ef2cdc262e69c09ee (diff) | |
download | rails-bf2c43983cde2482106a93786a05d3030c08f074.tar.gz rails-bf2c43983cde2482106a93786a05d3030c08f074.tar.bz2 rails-bf2c43983cde2482106a93786a05d3030c08f074.zip |
Merge pull request #7881 from guilleiguaran/fix-initializer
Rails.config doesn't exist, it should be Rails.application.config instead
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb index 9b41300e7e..a8285f88ca 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb @@ -1,7 +1,7 @@ # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. -# Rails.config.time_zone = 'Central Time (US & Canada)' +# Rails.application.config.time_zone = 'Central Time (US & Canada)' # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. -# Rails.config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] -# Rails.config.i18n.default_locale = :de +# Rails.application.config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] +# Rails.application.config.i18n.default_locale = :de |