Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix

Fixed the I18n deprecation warning
This commit is contained in:
Dmitriy Zaporozhets 2014-01-09 05:17:53 -08:00
commit 0d3f1a2d58

View file

@ -38,6 +38,7 @@ module Gitlab
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # 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.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de # config.i18n.default_locale = :de
config.i18n.enforce_available_locales = false
# Configure the default encoding used in templates for Ruby 1.9. # Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8" config.encoding = "utf-8"