Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop

6 files changed, 52 insertions, 52 deletions

diff --git a/lib/views/help/about.rhtml b/lib/views/help/about.rhtml
index b68ff99..a2b5ef2 100644
--- a/lib/views/help/about.rhtml
+++ b/lib/views/help/about.rhtml
@@ -3,7 +3,7 @@
 <%= render :partial => 'sidebar' %>
 
 <div id="left_column_flip">
- <h1 id="introduction">Introduction to WhatDoTheyKnow <a href="#introduction">#</a> </h1> <p>This is a custom "about" page</p>
+ <h1 id="introduction">Introduction to <%= site_name %> <a href="#introduction">#</a> </h1> <p>This is a custom "about" page</p>
 </div>
 
 
diff --git a/lib/views/help/api.rhtml b/lib/views/help/api.rhtml
index a21f450..323bdb7 100644
--- a/lib/views/help/api.rhtml
+++ b/lib/views/help/api.rhtml
@@ -8,10 +8,10 @@
 <h2> Introduction </h2>
 
 <p>This page explains how programmers can make other websites and software
-interact with WhatDoTheyKnow via an "API".
+interact with <%= site_name %> via an "API".
 </p>
 
-<p>WhatDoTheyKnow does not have a full API yet, but we are gradually adding
+<p><%= site_name %> does not have a full API yet, but we are gradually adding
 lots of things that are similar in use to an API as they are requested.
 </p>
 
@@ -69,7 +69,7 @@ information about the list of events in the feed.
 <h2> 4. Spreadsheet of all authorities </h2>
 
 <p>
-A spreadsheet file listing every body in WhatDoTheyKnow is available:
+A spreadsheet file listing every body in <%= site_name %> is available:
 <%= link_to "all-authorities.csv", all_public_bodies_csv_url() %>
 </p>
 
diff --git a/lib/views/help/credits.rhtml b/lib/views/help/credits.rhtml
index 08405da..bc493bc 100644
--- a/lib/views/help/credits.rhtml
+++ b/lib/views/help/credits.rhtml
@@ -7,7 +7,7 @@
 
 <dl>
 
-<dt id="thanks">Which people made WhatDoTheyKnow? <a href="#thanks">#</a> </dt>
+<dt id="thanks">Which people made <%= site_name %>? <a href="#thanks">#</a> </dt>
 <dd>Oh, nearly everyone (and <a href="http://www.mysociety.org/helpus">maybe you too</a>)! 
 <ul>
 <li>
@@ -77,7 +77,7 @@ You're all stars.
     <li>Help people find successful requests, and monitor performance of authorities, by 
     <a href="/categorise/play">playing the categorisation game</a>. </li>
     <li>Find out FOI email addresses of <a href="/help/requesting#missing_body">authorities that we're missing</a>.</li>
-    <li>Write a blog post about either WhatDoTheyKnow or an interesting request that you've
+    <li>Write a blog post about either <%= site_name %> or an interesting request that you've
     found. Post about it on a forum that you frequent. Tell friends about it.</li> <li>If you're
     a programmer, get the source code for our parent project, <a href="http://alaveteli.org">Alaveteli</a>
     and tell us about patches we can pull. It's made in Ruby on Rails.
diff --git a/lib/views/help/officers.rhtml b/lib/views/help/officers.rhtml
index 9d2bfd2..6636fef 100644
--- a/lib/views/help/officers.rhtml
+++ b/lib/views/help/officers.rhtml
@@ -9,17 +9,17 @@
 
 <dt id="top">I just got here from bottom of an FOI request, what is going on? <a href="#top">#</a> </dt>
 
-<dd><p>WhatDoTheyKnow is a service run by a charity. It helps ordinary members
+<dd><p><%= site_name %> is a service run by a charity. It helps ordinary members
 of the public make FOI requests, and easily track and share the responses.</p>
 
-<p>The FOI request you received was made by someone using WhatDoTheyKnow. You can
+<p>The FOI request you received was made by someone using <%= site_name %>. You can
 simply reply to the request as you would any other request from an individual.
 The only difference is that your response will be automatically published on
 the Internet.
 </p>
 <p>If you have privacy or other concerns, please read the answers below.
 You might also like to read the <a
-href="/help/about">introduction to WhatDoTheyKnow</a> to find out more about what
+href="/help/about">introduction to <%= site_name %></a> to find out more about what
 the site does from the point of view of a user. You can also search the
 site to find the authority that you work for, and view the status of
 any requests made using the site.
@@ -53,23 +53,23 @@ find a page listing all requests that each person has made.
 
 <dd>Yes it is. This
 <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically
-in the context of requests made via WhatDoTheyKnow.
+in the context of requests made via <%= site_name %>.
 </dd>
 
 <dt id="vexatious">Aren't you making lots of vexatious requests? <a href="#vexatious">#</a> </dt>
 
-<dd><p>WhatDoTheyKnow is not making any requests. We are sending requests on
+<dd><p><%= site_name %> is not making any requests. We are sending requests on
 behalf of our users, who are real people making the requests. </p>
 <p>Look at it like this - if lots of different people made requests from
 different Hotmail email addresses, then you would not think that Microsoft were
 making vexatious requests. It is exactly the same if lots of requests are made
-via WhatDoTheyKnow. Moreover, since all requests are public it is much easier
+via <%= site_name %>. Moreover, since all requests are public it is much easier
 for you to see if one of our users is making vexatious requests. </p>
 <p>If that isn't enough for you, the
 <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p>
 </dd>
 
-<dt id="spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!<a href="#spam_problems">#</a> </dt>
+<dt id="spam_problems">I can see a request on <%= site_name %>, but we never got it by email!<a href="#spam_problems">#</a> </dt>
 
 <dd><p>If a request appears on the site, then we have attempted to send it to
 the authority by email. Any delivery failure messages will automatically
@@ -79,8 +79,8 @@ href="/help/contact">Contact us</a> if there is a better address we can
 use.</p>
 <p>Requests are sometimes not delivered because they are quietly removed by
 "spam filters" in the IT department of the authority. Authorities can make
-sure this doesn't happen by asking their IT departments to "whitelist" 
-any email from <strong>@whatdotheyknow.com</strong>.
+sure this doesn't happen by asking their IT departments to "whitelist"
+any email from <strong>@<%= Configuration::incoming_email_domain %></strong>.
 If you <a href="/help/contact">ask us</a> we will resend any request,
 and/or give technical details of delivery so an IT department can chase
 up what happened to the message.
@@ -123,7 +123,7 @@ it is best if they show the hard work they are doing by explaining what is
 taking the extra time to do.
 </p>
 
-<p>That said, WhatDoTheyKnow does show the maximum legal deadline
+<p>That said, <%= site_name %> does show the maximum legal deadline
 for response on each request. Here's how we calculate it.</p>
 
 <ul>
@@ -148,18 +148,18 @@ one case which is not normal, see the next question about
 <a href="#public_interest_test">public interest test time extensions</a>.
 </p>
 
-<p>Schools are also a special case, which WhatDoTheyKnow displays differently.
+<p>Schools are also a special case, which <%= site_name %> displays differently.
 </p>
 
 <ul>
 <li>Since June 2009, <strong>schools</strong> have "20 working days
 disregarding any working day which is not a school day, or 60 working days,
-whichever is first" (<a href="http://www.opsi.gov.uk/si/si2009/draft/ukdsi_9780111477632_en_1">FOI (Time for Compliance with Request) Regulations 2009</a>). WhatDoTheyKnow indicates on requests to schools that the 20 day deadline is only
+whichever is first" (<a href="http://www.opsi.gov.uk/si/si2009/draft/ukdsi_9780111477632_en_1">FOI (Time for Compliance with Request) Regulations 2009</a>). <%= site_name %> indicates on requests to schools that the 20 day deadline is only
 during term time, and shows them as definitely overdue after 60 working days
 </li>
 </ul>
 
-<p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>. 
+<p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>.
 Meanwhile, remember that the law says authorities must respond
 <strong>promptly</strong>. That's really what matters.</p>
 
@@ -173,25 +173,25 @@ Meanwhile, remember that the law says authorities must respond
 extension when applying a <strong>public interest test</strong>.  Information
 Commissioner guidance says that it should only be used in "exceptionally
 complex" cases
-(<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>). 
-WhatDoTheyKnow doesn't specifically handle this case, which is why we use the
+(<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>).
+<%= site_name %> doesn't specifically handle this case, which is why we use the
 phrase "should normally have responded by" when the 20 working day time is
-exceeded. 
+exceeded.
 </p>
 
 <p>The same guidance says that, even in exceptionally complex cases, no
-Freedom of Information request should take more than <strong>40 working days</strong> 
-to answer.  WhatDoTheyKnow displays requests which are overdue by that much
+Freedom of Information request should take more than <strong>40 working days</strong>
+to answer.  <%= site_name %> displays requests which are overdue by that much
 with stronger wording to indicate they are definitely late.
 </p>
 
 <p>The Freedom of Information (Scotland) Act does not allow such a public
-interest extension. WhatDoTheyKnow would like to see the law changed to either
+interest extension. <%= site_name %> would like to see the law changed to either
 remove the extension from the UK Act, or to reintroduce an absolute time limit
 of 40 working days even with the extension (the House of Lords <a
 href="http://www.publicwhip.org.uk/division.php?date=2000-10-17&amp;number=1&amp;house=lords">voted
 to remove</a> provision for such a time limit during the initial passage
-of the UK Act through Parliament). 
+of the UK Act through Parliament).
 </p>
 </dd>
 
@@ -214,7 +214,7 @@ circumstances, see our <a href="/help/privacy#takedown">take down policy</a>.
 
 <dd><p>To prevent spam, we automatically remove most emails and some mobile numbers from
 responses to requests.  Please <a href="/help/contact">contact us</a> if we've
-missed one. 
+missed one.
 For technical reasons we don't always remove them from attachments, such as certain PDFs.</p>
 <p>If you need to know what an address was that we've removed, please <a
   href="/help/contact">get in touch with us</a>. Occasionally, an email address
@@ -225,7 +225,7 @@ form in an annotation.
 <dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt>
 
 <dd>Our Freedom of Information law is "applicant blind", so anyone in the
-world can request the same document and get a copy of it. 
+world can request the same document and get a copy of it.
 
 If you think our making a document available on the internet infringes your
 copyright, you may <a href="/help/contact">contact us</a> and ask us
diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml
index 16fadd6..7102fc8 100644
--- a/lib/views/help/privacy.rhtml
+++ b/lib/views/help/privacy.rhtml
@@ -11,14 +11,14 @@
 
 <dd><p>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.  </p>
+request to.  They only get to see an email address
+@<%= Configuration::incoming_email_domain %> which is specific to that request.  </p>
 <p>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.</p>
 </dd>
 
 <dt id="nasty_spam">Will you send nasty, brutish spam to my email address? <a href="#nasty_spam">#</a> </dt>
-<dd>Nope. After you sign up to WhatDoTheyKnow we will only send you emails
+<dd>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
@@ -36,7 +36,7 @@ requests (<a href="#delete_requests">more details</a>).
 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.
 </p>
 <p>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.
 <ul>
 <li>Use a different form of your name. The guidance says
 that "Mr Arthur Thomas Roberts" can make a valid request as "Arthur Roberts",
-"A. T. Roberts", or "Mr Roberts", but <strong>not</strong> as "Arthur" or "A.T.R.". 
+"A. T. Roberts", or "Mr Roberts", but <strong>not</strong> as "Arthur" or "A.T.R.".
 </li>
 <li>Women may use their maiden name.</li>
 <li>In most cases, you may use any name by which you are "widely known and/or
 is regularly used".
 <li>Use the name of an organisation, the name of a company, the trading name of
 a company, or the trading name of a sole trader.
-<li>Ask someone else to make the request on your behalf. 
+<li>Ask someone else to make the request on your behalf.
 <li>You may, if you are really stuck, ask us to make the request on
 your behalf. Please <a href="/help/contact">contact us</a> with
 a good reason why you cannot make the request yourself and cannot
@@ -89,19 +89,19 @@ ask a friend to. We don't have the resources to do this for everyone.
 
 <dd>
 <p>If a public authority asks you for your full, physical address, reply to them saying
-that section 8.1.b of the FOI Act asks for an "address for correspondence", 
-and that the email address you are using is sufficient. 
+that section 8.1.b of the FOI Act asks for an "address for correspondence",
+and that the email address you are using is sufficient.
 </p>
 <p>
 The Ministry of Justice has <a href="http://www.justice.gov.uk/guidance/foi-procedural-what.htm">guidance
 on this</a> &ndash;
 <em>"As well as hard copy written correspondence, requests that are
-transmitted electronically (for example, in emails) are acceptable 
+transmitted electronically (for example, in emails) are acceptable
 ... If a request is received by email and no postal address is given, the email
 address should be treated as the return address."
 </em>
 </p>
-<p>As if that isn't enough, the Information Commissioner's 
+<p>As if that isn't enough, the Information Commissioner's
 <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/practical_application/foi_hints_for_practitioners_handing_foi_and_eir_requests_2008_final.pdf">Hints for Practitioners</a> say
 <em>"Any correspondence could include a request for information. If it is written (this includes e-mail), legible, gives the name of the applicant, an address for reply (which could be electronic), and includes a description of the information required, then it will fall within the scope of the legislation."</em>
 </p>
@@ -124,7 +124,7 @@ give you an email address to use for that purpose.</p>
 
 <dd>
 
-<p>WhatDoTheyKnow is a permanent, public archive of Freedom of
+<p><%= 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.
@@ -142,7 +142,7 @@ see the section on <a href="#real_name">pseudonyms</a>.</p>
 
 <dt id="takedown">Can you take down personal information about me? <a href="#takedown">#</a> </dt>
 
-<dd> 
+<dd>
 
 <p>If you see any personal information about you on the site which you'd like
 us to remove or hide, then please <a href="/help/contact">let us know</a>.
@@ -166,8 +166,8 @@ which outweighs the public interest, and must demonstrate that efforts have
 been made to conceal the name on the organisation's own website.</p>
 
 <p>For all other requests we apply a public interest test to decide
-whether information should be removed. 
-<a href="http://www.statutelaw.gov.uk/content.aspx?ActiveTextDocId=3190650"> Section 32</a> 
+whether information should be removed.
+<a href="http://www.statutelaw.gov.uk/content.aspx?ActiveTextDocId=3190650"> Section 32</a>
 of the Data Protection Act 1998 permits us to do this, as the material we
 publish is journalistic. We cannot easily edit many types of attachments (such
 as PDFs, or Microsoft Word or Excel files), so we will usually ask
diff --git a/lib/views/help/requesting.rhtml b/lib/views/help/requesting.rhtml
index 4b6a55f..7787d15 100644
--- a/lib/views/help/requesting.rhtml
+++ b/lib/views/help/requesting.rhtml
@@ -12,7 +12,7 @@
 <p>It can be hard to untangle government's complicated structured, and work out
 who knows the information that you want. Here are a few tips:
 <ul>
-<li>Browse or search WhatDoTheyKnow looking for similar requests to yours.</li>
+<li>Browse or search <%= site_name %> looking for similar requests to yours.</li>
 <li>When you've found an authority you think might have the information, use
 the "home page" link on the right hand side of their page to check what they do
 on their website.</li>
@@ -43,7 +43,7 @@ to hear from you too.
 <dt id="authorities">Why do you include some authorities that aren't formally subject to FOI?<a href="#authorities">#</a> </dt>
 
 <dd>
-<p>WhatDoTheyKnow lets you make requests for information to a range of
+<p><%= site_name %> lets you make requests for information to a range of
 organisations:</p>
 
 <ul>
@@ -135,7 +135,7 @@ requests.
 or one or two other cases, then they may have more time
 (<a href="/help/officers#days">full details</a>).
 
-<p>WhatDoTheyKnow will email you if you don't get a timely response.  You can
+<p><%= site_name %> will email you if you don't get a timely response.  You can
 then send the public authority a message to remind them, and tell them if they
 are breaking the law.</p>
 
@@ -152,7 +152,7 @@ are breaking the law.</p>
     </li>
     <li>If they have not received it, the problem is most likely due to
     "spam filters". Refer the authority to the measures in the answer 
-    '<a href="/help/officers#spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!</a>' 
+    '<a href="/help/officers#spam_problems">I can see a request on <%= site_name %>, but we never got it by email!</a>' 
     in the FOI officers section of this help. 
     </li>
     <li>If you're still having no luck, then you can ask for an internal review,
@@ -198,7 +198,7 @@ Information Commissioner's guidance</a> for details.</p>
 <dt id="data_protection">Can I request information about myself? <a href="#data_protection">#</a> </dt>
 
 <dd>
-<p>No. Requests made using WhatDoTheyKnow are public, made under the Freedom of
+<p>No. Requests made using <%= site_name %> are public, made under the Freedom of
 Information Act, and cannot help you find information about a private
 individual.</p>
 
@@ -216,7 +216,7 @@ immediately so we can remove it.</p>
 
 <dt id="private_requests">I'd like to keep my request secret! (At least until I publish my story) <a href="#private_requests">#</a> </dt>
 
-<dd><p>WhatDoTheyKnow is currently only designed for public requests. All
+<dd><p><%= site_name %> is currently only designed for public requests. All
 responses that we receive are automatically published on the website for anyone
 to read.  </p>
 <p>You should contact the public authority directly if you would like to
@@ -234,7 +234,7 @@ the Environmental Information Regulations (EIR).
 </p>
 
 <p>It's a very similar law, so you make a request
-to them using WhatDoTheyKnow in just the same way as an FOI request. The only
+to them using <%= site_name %> in just the same way as an FOI request. The only
 difference is that on the page where your write you request, it reminds you
 that you can only request "environmental information" and tells you what that
 means. It is quite broad.
@@ -259,17 +259,17 @@ to the other authorities, you must copy and paste it by hand.
 
 <dt id="offsite">I made a request off the site, how do I upload it to the archive?<a href="#offsite">#</a> </dt>
 
-<dd>WhatDoTheyKnow is an archive of requests made through the site,
+<dd><%= site_name %> is an archive of requests made through the site,
 and does not try to be an archive of all FOI requests. We'll never support uploading
 other requests. For one thing, we wouldn't be able to verify that other
 responses actually came from the authority. If this really matters to you,
-you can always make the same request again via WhatDoTheyKnow.
+you can always make the same request again via <%= site_name %>.
 </dd>
 
 <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt>
 
 <dd> 
-<p>Annotations on WhatDoTheyKnow are to help
+<p>Annotations on <%= site_name %> are to help
 people get the information they want, or to give them pointers to places they
 can go to help them act on it. We reserve the right to remove anything else.
 </p>