# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1389174046 0
# Node ID 274b89aabe3845ca12a45064197ed1fe63611dcc
# Parent  2436fda71fa9c39dab93f7ed197ce62738172c0d# Parent  926dce5f57787263268cc5064faf6ce59a3df790
Merge

diff -r 926dce5f5778 -r 274b89aabe38 config/application.rb
--- a/config/application.rb	Mon Jan 06 15:53:59 2014 +0000
+++ b/config/application.rb	Wed Jan 08 09:40:46 2014 +0000
@@ -32,6 +32,10 @@
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
 
+    # Avoid deprecation warning (may want to change this later if future
+    # Redmine updates are OK with it)
+    config.i18n.enforce_available_locales = false
+
     # 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