Merged r12365 from trunk to 2.4-stable

prevent i18n deprecated warning

i18n 0.6.4 on Rails 3.2.16 changes behavior.
3b6e56e06f

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12366 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2013-12-07 02:06:53 +00:00
parent b8a93cd445
commit 6d33524888

View File

@ -33,6 +33,8 @@ module RedmineApp
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
I18n.enforce_available_locales = false
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"