diff options
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/alaveteli.rb | 18 | ||||
| -rw-r--r-- | config/initializers/fast_gettext.rb | 2 | ||||
| -rw-r--r-- | config/initializers/secret_token.rb | 2 | ||||
| -rw-r--r-- | config/initializers/theme_loader.rb | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 5ce519829..f5fdcf79d 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -40,22 +40,22 @@ ALAVETELI_VERSION = '0.6.8' # The Rails cache is set up by the Interlock plugin to use memcached # Domain for URLs (so can work for scripts, not just web pages) -ActionMailer::Base.default_url_options[:host] = Configuration::domain +ActionMailer::Base.default_url_options[:host] = AlaveteliConfiguration::domain # So that javascript assets use full URL, so proxied admin URLs read javascript OK -if (Configuration::domain != "") +if (AlaveteliConfiguration::domain != "") ActionController::Base.asset_host = Proc.new { |source, request| if ENV["RAILS_ENV"] != "test" && request.fullpath.match(/^\/admin\//) - Configuration::admin_public_url + AlaveteliConfiguration::admin_public_url else - Configuration::domain + AlaveteliConfiguration::domain end } end # fallback locale and available locales -available_locales = Configuration::available_locales.split(/ /) -default_locale = Configuration::default_locale +available_locales = AlaveteliConfiguration::available_locales.split(/ /) +default_locale = AlaveteliConfiguration::default_locale FastGettext.default_available_locales = available_locales I18n.locale = default_locale @@ -81,7 +81,7 @@ require 'public_body_categories' # Temporarily commented out the lines below on the Rails 3 spike. # TODO: Reinstate this properly! -#if !Configuration.exception_notifications_from.blank? && !Configuration.exception_notifications_to.blank? -# ExceptionNotification::Notifier.sender_address = Configuration::exception_notifications_from -# ExceptionNotification::Notifier.exception_recipients = Configuration::exception_notifications_to +#if !AlaveteliConfiguration.exception_notifications_from.blank? && !AlaveteliConfiguration.exception_notifications_to.blank? +# ExceptionNotification::Notifier.sender_address = AlaveteliConfiguration::exception_notifications_from +# ExceptionNotification::Notifier.exception_recipients = AlaveteliConfiguration::exception_notifications_to #end diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index 1cd6440e4..752448a41 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -3,4 +3,4 @@ FastGettext.default_text_domain = 'app' I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks) -RoutingFilter::Locale.include_default_locale = Configuration::include_default_locale_in_urls
\ No newline at end of file +RoutingFilter::Locale.include_default_locale = AlaveteliConfiguration::include_default_locale_in_urls diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 5277e8927..f82348169 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -4,4 +4,4 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -Alaveteli::Application.config.secret_token = Configuration::cookie_store_session_secret +Alaveteli::Application.config.secret_token = AlaveteliConfiguration::cookie_store_session_secret diff --git a/config/initializers/theme_loader.rb b/config/initializers/theme_loader.rb index 877149e9d..4c8967c97 100644 --- a/config/initializers/theme_loader.rb +++ b/config/initializers/theme_loader.rb @@ -3,7 +3,7 @@ $alaveteli_route_extensions = [] if ENV["RAILS_ENV"] != "test" # Don't let the themes interfere with Alaveteli specs - for url in Configuration::theme_urls.reverse + for url in AlaveteliConfiguration::theme_urls.reverse theme_name = url.sub(/.*\/(.*).git/, "\\1") theme_main_include = File.expand_path "../../../vendor/plugins/#{theme_name}/lib/alavetelitheme.rb", __FILE__ if File.exists? theme_main_include |