Project

General

Profile

« Previous | Next » 

Revision 12366

Added by Toshi MARUYAMA over 11 years ago

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

View differences:

branches/2.4-stable/config/application.rb
33 33
    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
34 34
    # config.i18n.default_locale = :de
35 35

  
36
    I18n.enforce_available_locales = false
37

  
36 38
    # Configure the default encoding used in templates for Ruby 1.9.
37 39
    config.encoding = "utf-8"
38 40

  

Also available in: Unified diff