nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ensure our locales are at the bottom of the load path, fixes #2614

Browse source
This commit is contained in:
Jonne Haß 2013-01-31 16:40:15 +01:00
parent c763586a6a
commit cba76060bf
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/initializers/locale.rb
View file

@ -3,7 +3,7 @@
# the COPYRIGHT file.
require 'i18n_interpolation_fallbacks'
require "i18n/backend/fallbacks"
require "i18n/backend/fallbacks"
settings_file = Pathname.new(__FILE__).dirname.join('..').expand_path.join('locale_settings.yml')
if settings_file.exist?
@ -23,7 +23,8 @@ end
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
# Use the railtie configuration option to ensure overiding devise.
Diaspora::Application.config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
I18n.default_locale = DEFAULT_LANGUAGE
I18n::Backend::Simple.send(:include, I18n::Backend::InterpolationFallbacks)