2 files changed, 7 insertions, 12 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index d78bc3925..2c6ee2fbc 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.12'
+ALAVETELI_VERSION = '0.13'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):
@@ -34,14 +34,6 @@ if AlaveteliConfiguration::force_ssl
   ActionMailer::Base.default_url_options[:protocol] = "https"
 end
 
-# fallback locale and available locales
-available_locales = AlaveteliConfiguration::available_locales.split(/ /)
-default_locale = AlaveteliConfiguration::default_locale
-
-FastGettext.default_available_locales = available_locales
-I18n.locale = default_locale
-I18n.available_locales = available_locales.map {|locale_name| locale_name.to_sym}
-I18n.default_locale = default_locale
 
 # Load monkey patches and other things from lib/
 require 'ruby19.rb'
@@ -57,6 +49,10 @@ require 'public_body_categories'
 require 'ability'
 require 'normalize_string'
 require 'alaveteli_file_types'
+require 'alaveteli_localization'
+
+AlaveteliLocalization.set_locales(AlaveteliConfiguration::available_locales,
+                                  AlaveteliConfiguration::default_locale)
 
 # Allow tests to be run under a non-superuser database account if required
 if Rails.env == 'test' and ActiveRecord::Base.configurations['test']['constraint_disabling'] == false
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)