diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2012-10-08 09:08:27 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2012-10-08 09:08:27 -0700 |
| commit | 43e14f8ff203c21646f733d35bdde4e68da70a3b (patch) | |
| tree | e4671f3eded537b701c66d4000cd3e206447d502 /railties/lib/rails/generators | |
| parent | bb17a0f085aba40a1952612f6c98b2a5804a1152 (diff) | |
| parent | 185c0209961dc0caac4e53383b7d173d69ec5911 (diff) | |
| download | rails-43e14f8ff203c21646f733d35bdde4e68da70a3b.tar.gz rails-43e14f8ff203c21646f733d35bdde4e68da70a3b.tar.bz2 rails-43e14f8ff203c21646f733d35bdde4e68da70a3b.zip | |
Merge pull request #7873 from steveklabnik/update_initializer
Moving locale stuff from app.rb to an initializer.
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 8 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 81bf22a159..fb43c90e21 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -23,14 +23,6 @@ module <%= app_const_base %> # Custom directories with classes and modules you want to be autoloadable. # config.autoload_paths += %W(#{config.root}/extras) - # 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. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] 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 new file mode 100644 index 0000000000..9b41300e7e --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb @@ -0,0 +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)' + +# 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 |