From fed7b7ebbece65e3247f8be7da11df90c74e2084 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 18 Sep 2012 15:57:20 +1000 Subject: Replace instances of WhatDoTheyKnow with site_name from configuration --- lib/views/help/privacy.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/views/help/privacy.rhtml') diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml index 16fadd6..33cdd81 100644 --- a/lib/views/help/privacy.rhtml +++ b/lib/views/help/privacy.rhtml @@ -18,7 +18,7 @@ email address to them. You will be told that this is going to happen.

Will you send nasty, brutish spam to my email address? #
-
Nope. After you sign up to WhatDoTheyKnow we will only send you emails +
Nope. After you sign up to <%= site_name %> we will only send you emails relating to a request you made, an email alert that you have signed up for, or for other reasons that you specifically authorise. We will never give or sell your email addresses to anyone else, unless we are obliged to by law, or @@ -124,7 +124,7 @@ give you an email address to use for that purpose.

-

WhatDoTheyKnow is a permanent, public archive of Freedom of +

<%= site_name %> is a permanent, public archive of Freedom of Information requests. Even though you may not find the response to a request useful any more, it may be of interest to others. For this reason, we will not delete requests. -- cgit v1.2.3 From aebfa2e30408ebff5b45177472913097bed6afa5 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 18 Sep 2012 16:01:53 +1000 Subject: Use email domain from configuration rather than hardcoded domain --- lib/views/help/privacy.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/views/help/privacy.rhtml') diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml index 33cdd81..4f4f2d3 100644 --- a/lib/views/help/privacy.rhtml +++ b/lib/views/help/privacy.rhtml @@ -12,7 +12,7 @@

We will not disclose your email address to anyone unless we are obliged to by law, or you ask us to. This includes the public authority that you are sending a request to. They only get to see an email address -@whatdotheyknow.com which is specific to that request.

+@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %> which is specific to that request.

If you send a message to another user on the site, then it will reveal your email address to them. You will be told that this is going to happen.

-- cgit v1.2.3 From 11fb3fc50cb8a127cafb191e32f191aebdcdb7bc Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 18 Sep 2012 12:25:56 +0100 Subject: Add default value for INCOMING_EMAIL_DOMAIN so an error isn't thrown in the case where this isn't defined yet. --- lib/views/help/privacy.rhtml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/views/help/privacy.rhtml') diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml index 4f4f2d3..2a4007a 100644 --- a/lib/views/help/privacy.rhtml +++ b/lib/views/help/privacy.rhtml @@ -11,8 +11,8 @@

We will not disclose your email address to anyone unless we are obliged to by law, or you ask us to. This includes the public authority that you are sending a -request to. They only get to see an email address -@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %> which is specific to that request.

+request to. They only get to see an email address +@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN', 'localhost') %> which is specific to that request.

If you send a message to another user on the site, then it will reveal your email address to them. You will be told that this is going to happen.

@@ -36,7 +36,7 @@ requests (more details). Your name is tangled up with your request, so has to be published as well. It is only fair, as we're going to publish the name of the civil servant who writes the response to your request. Using your real name also helps people -get in touch with you to assist you with your research or to campaign with you. +get in touch with you to assist you with your research or to campaign with you.

By law, you must use your real name for the request to be a valid Freedom of Information request. See the next question for alternatives if you do not want @@ -67,14 +67,14 @@ Information Commissioner later about the handling of your request.