summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-12-07 02:06:53 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-12-07 02:06:53 +0000
commit6d335248884b119c9a5db9f6ee86ca2082f79eeb (patch)
tree971f89b468007e5b25ed25418078334483b45df0
parentb8a93cd4454da42ef4fc8601c255b8ceafd8a322 (diff)
downloadredmine-6d335248884b119c9a5db9f6ee86ca2082f79eeb.tar.gz
redmine-6d335248884b119c9a5db9f6ee86ca2082f79eeb.zip
Merged r12365 from trunk to 2.4-stable
prevent i18n deprecated warning i18n 0.6.4 on Rails 3.2.16 changes behavior. https://github.com/svenfuchs/i18n/commit/3b6e56e06fd70f6e4507996b017238505e66608c git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12366 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--config/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index e18447fa4..58d949a48 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -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"