diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2012-09-25 08:55:35 +1000 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2012-09-25 08:55:35 +1000 |
| commit | f59700138f7360436767fddea554c739e2cd484b (patch) | |
| tree | 8c3af52f3f1f369ab412fa7571f19860e4f260b8 /app/controllers/services_controller.rb | |
| parent | 265e336ae0608af39aa3aad8b27862e572222562 (diff) | |
Extract configuration with defaults into one module
Diffstat (limited to 'app/controllers/services_controller.rb')
| -rw-r--r-- | app/controllers/services_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 40e0faaf7..ead5d73b7 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -6,7 +6,7 @@ class ServicesController < ApplicationController def other_country_message text = "" - iso_country_code = MySociety::Config.get('ISO_COUNTRY_CODE').downcase + iso_country_code = Configuration::iso_country_code.downcase if country_from_ip.downcase != iso_country_code found_country = WorldFOIWebsites.by_code(country_from_ip) found_country_name = !found_country.nil? && found_country[:country_name] @@ -36,9 +36,9 @@ class ServicesController < ApplicationController :content_type => "text/plain", :layout => false, :locals => {:name_to => info_request.user_name, - :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), + :name_from => Configuration::contact_name, :info_request => info_request, :reason => params[:reason], - :info_request_url => 'http://' + MySociety::Config.get('DOMAIN') + request_url(info_request), + :info_request_url => 'http://' + Configuration::domain + request_url(info_request), :site_name => site_name} end |