diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-01-22 05:44:28 -0800 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-01-22 05:44:28 -0800 |
| commit | 94f7583497a1f4d08bc70637c8d9709dd53069a7 (patch) | |
| tree | b7b9da4d9384cf64f3735f7d9fb738fa3e00a54c /railties/lib | |
| parent | cb56c39b5186255d8208c6139669ca74e75d5759 (diff) | |
| parent | 6fcdcfe1e5fe8780f3c9c56bb4a0b7963f313e4e (diff) | |
| download | rails-94f7583497a1f4d08bc70637c8d9709dd53069a7.tar.gz rails-94f7583497a1f4d08bc70637c8d9709dd53069a7.tar.bz2 rails-94f7583497a1f4d08bc70637c8d9709dd53069a7.zip | |
Merge pull request #9027 from carlosantoniodasilva/revert-locale
Revert locale
Diffstat (limited to 'railties/lib')
| -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 | 9 |
2 files changed, 8 insertions, 9 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 f5d7d698a3..d149413e2e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -22,6 +22,14 @@ 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 <% if options.skip_sprockets? -%> # Disable the asset pipeline. 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 deleted file mode 100644 index d89dac7c6a..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb +++ /dev/null @@ -1,9 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# 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.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.application.config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] -# Rails.application.config.i18n.default_locale = :de |