From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 7 Dec 2013 02:06:53 +0000 (+0000)
Subject: Merged r12365 from trunk to 2.4-stable
X-Git-Tag: 2.4.2~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d335248884b119c9a5db9f6ee86ca2082f79eeb;p=redmine.git

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
---

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"