aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/request_controller.rb6
-rw-r--r--app/controllers/user_controller.rb10
2 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 817fc2fdf..885e1fcc1 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: request_controller.rb,v 1.62 2008-02-28 14:14:47 francis Exp $
+# $Id: request_controller.rb,v 1.63 2008-02-28 14:25:51 francis Exp $
class RequestController < ApplicationController
@@ -193,7 +193,7 @@ class RequestController < ApplicationController
flash[:notice] = "Oh no! Sorry to hear that your request was rejected. Here is what to do now."
redirect_to unhappy_url
elsif @info_request.calculate_status == 'successful'
- flash[:notice] = "We're glad you got all the information that you wanted. Thank you for using foi.mysociety.org"
+ flash[:notice] = "We're glad you got all the information that you wanted. Thank you for using WhatDoTheyKnow."
# XXX quiz them here for a comment
redirect_to show_request_url(:url_title => @info_request.url_title)
elsif @info_request.calculate_status == 'partially_successful'
@@ -204,7 +204,7 @@ class RequestController < ApplicationController
flash[:notice] = "Please write your follow up message containing the necessary clarifications below."
redirect_to show_response_url(:id => @info_request.id, :incoming_message_id => @events_needing_description[-1].params[:incoming_message_id])
elsif @info_request.calculate_status == 'requires_admin'
- flash[:notice] = "Thanks! The foi.mysociety.org team have been notified."
+ flash[:notice] = "Thanks! The WhatDoTheyKnow team have been notified."
redirect_to show_request_url(:url_title => @info_request.url_title)
else
raise "unknown calculate_status " + @info_request.calculate_status
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 954d44b17..03b93db6f 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user_controller.rb,v 1.32 2008-02-28 12:29:43 francis Exp $
+# $Id: user_controller.rb,v 1.33 2008-02-28 14:25:51 francis Exp $
class UserController < ApplicationController
# Show page about a set of users with same url name
@@ -125,8 +125,8 @@ class UserController < ApplicationController
post_redirect = PostRedirect.new(:uri => url , :post_params => {},
:reason_params => {
:web => "",
- :email => "Then your can change your password on foi.mysociety.org",
- :email_subject => "Change your password on foi.mysociety.org"
+ :email => "Then your can change your password on WhatDoTheyKnow.com",
+ :email_subject => "Change your password on WhatDoTheyKnow.com"
})
post_redirect.user = user_signchange
post_redirect.save!
@@ -179,8 +179,8 @@ class UserController < ApplicationController
@post_redirect = PostRedirect.new(:uri => params[:r], :post_params => {},
:reason_params => {
:web => "",
- :email => "Then your can sign in to foi.mysociety.org",
- :email_subject => "Confirm your account on foi.mysociety.org"
+ :email => "Then your can sign in to WhatDoTheyKnow.com",
+ :email_subject => "Confirm your account on WhatDoTheyKnow.com"
})
@post_redirect.save!
params[:token] = @post_redirect.token