diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-07-29 16:32:51 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-07-29 16:32:51 +0100 |
| commit | 6b6ada3571d9d05d8b2c6a59b5134e634775f617 (patch) | |
| tree | b81a5421bb40de9b603c5a386b5b44a02b1e931b /config/initializers/fast_gettext.rb | |
| parent | b17910d494ae1a459c83b43e4b668ca4e80fc680 (diff) | |
| parent | a73ffdc2a6801961ce2b5c9719651231dd484021 (diff) | |
Merge branch 'feature/localisation-fixes' into rails-3-develop
Diffstat (limited to 'config/initializers/fast_gettext.rb')
| -rw-r--r-- | config/initializers/fast_gettext.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index 752448a41..b00524993 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -1,6 +1,5 @@ -FastGettext.add_text_domain 'app', :path => File.join(Rails.root, 'locale'), :type => :po -FastGettext.default_text_domain = 'app' +AlaveteliLocalization.set_default_text_domain('app', File.join(Rails.root, 'locale')) I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks) -RoutingFilter::Locale.include_default_locale = AlaveteliConfiguration::include_default_locale_in_urls +AlaveteliLocalization.set_default_locale_urls(AlaveteliConfiguration::include_default_locale_in_urls) |