comparison config/application.rb @ 1490:b1f6665080fd

Merge from live branch
author Chris Cannam
date Mon, 17 Mar 2014 08:55:57 +0000
parents 2436fda71fa9
children 51364c0cd58f
comparison
equal deleted inserted replaced
1450:020bc7fe7a2a 1490:b1f6665080fd
30 30
31 # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. 31 # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
32 # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. 32 # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
33 # config.time_zone = 'Central Time (US & Canada)' 33 # config.time_zone = 'Central Time (US & Canada)'
34 34
35 # Avoid deprecation warning (may want to change this later if future
36 # Redmine updates are OK with it)
37 config.i18n.enforce_available_locales = false
38
35 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. 39 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
36 # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] 40 # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
37 # config.i18n.default_locale = :de 41 # config.i18n.default_locale = :de
38 42
39 # Configure the default encoding used in templates for Ruby 1.9. 43 # Configure the default encoding used in templates for Ruby 1.9.