diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:51:18 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:51:18 +0100 |
| commit | 3d12cbe6ee7ff49dad9a473efc0792b2a4f4cba6 (patch) | |
| tree | 1c43d3a004293f442f61b0e64847a4ef16cacd2a /config/initializers/fast_gettext.rb | |
| parent | c449240a1b1cddebb53e9748b15be43c0f65c463 (diff) | |
| parent | 4b95ccffc468c256d6ba6248303dd2b78bf5896a (diff) | |
Merge branch 'release/0.13' into wdtk
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
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) |