diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 3 | ||||
| -rw-r--r-- | app/models/application_mailer.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 516081d42..405327952 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,8 +29,7 @@ class ApplicationController < ActionController::Base helper_method :site_name, :locale_from_params def site_name - # XXX should come from database: - site_name = "InformataZyrtare.org" + site_name = MySociety::Config.get('SITE_NAME', 'Alaveteli') return site_name end diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index 623b97c5b..508ff2016 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_mailer.rb @@ -15,7 +15,9 @@ class ApplicationMailer < ActionMailer::Base self.raise_delivery_errors = true def contact_from_name_and_email - "InformataZyrtare <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">" + contact_name = MySociety::Config.get("CONTACT_NAME", 'contact@localhost') + contact_email = MySociety::Config.get("CONTACT_EMAIL", 'Alaveteli') + return "#{contact_name} <#{contact_email}>" end def blackhole_email |