aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/controllers/request_controller.rb2
-rw-r--r--app/models/info_request.rb6
-rw-r--r--app/models/info_request_event.rb2
-rw-r--r--app/models/track_thing.rb2
-rw-r--r--app/views/comment/new.rhtml2
-rw-r--r--app/views/general/search.rhtml2
-rw-r--r--app/views/help/about.rhtml2
-rw-r--r--app/views/help/unhappy.rhtml4
-rw-r--r--app/views/request/_describe_state.rhtml2
-rw-r--r--app/views/request/_other_describe_state.rhtml2
-rw-r--r--app/views/request/show.rhtml2
-rw-r--r--spec/models/request_mailer_spec.rb4
12 files changed, 16 insertions, 16 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index efb858adc..0664093c3 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -356,7 +356,7 @@ class RequestController < ApplicationController
"
redirect_to request_url(@info_request)
elsif @info_request.calculate_status == 'rejected'
- flash[:notice] = "Oh no! Sorry to hear that your request was rejected. Here is what to do now."
+ flash[:notice] = "Oh no! Sorry to hear that your request was refused. Here is what to do now."
redirect_to unhappy_url(@info_request)
elsif @info_request.calculate_status == 'successful'
flash[:notice] = "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a href=\"http://www.mysociety.org/donate/\">make a donation</a> to the charity which runs it.</p>"
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index da953f231..f6eec0601 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -56,7 +56,7 @@ class InfoRequest < ActiveRecord::Base
'waiting_clarification',
'gone_postal',
'not_held',
- 'rejected',
+ 'rejected', # this is called 'refused' in UK FOI law and the user interface, but 'rejected' internally for historic reasons
'successful',
'partially_successful',
'internal_review',
@@ -83,7 +83,7 @@ class InfoRequest < ActiveRecord::Base
'authority_only', # only people from authority domains
'nobody'
]
- # what to do with rejected new responses
+ # what to do with refused new responses
validates_inclusion_of :handle_rejected_responses, :in => [
'bounce', # return them to sender
'holding_pen', # put them in the holding pen
@@ -744,7 +744,7 @@ public
elsif status == 'not_held'
"Information not held."
elsif status == 'rejected'
- "Rejected."
+ "Refused."
elsif status == 'partially_successful'
"Partially successful."
elsif status == 'successful'
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 4e2a10a1f..1422431dc 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -282,7 +282,7 @@ class InfoRequestEvent < ActiveRecord::Base
elsif status == 'not_held'
return "Information not held"
elsif status == 'rejected'
- return "Rejection"
+ return "Refused"
elsif status == 'partially_successful'
return "Some information sent"
elsif status == 'successful'
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index 3392a4210..c2036118f 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -215,7 +215,7 @@ class TrackThing < ActiveRecord::Base
# RSS sorting - XXX hmmm, we don't really know which to use
# here for sorting. Might be a query term (e.g. 'cctv'), in
# which case newest is good, or might be something like
- # all rejected requests in which case want to sort by
+ # all refused requests in which case want to sort by
# described (when we discover criteria is met). Rather
# conservatively am picking described, as that will make
# things appear in feed more than the should, rather than less.
diff --git a/app/views/comment/new.rhtml b/app/views/comment/new.rhtml
index c0e7e3a22..7d7dfee6f 100644
--- a/app/views/comment/new.rhtml
+++ b/app/views/comment/new.rhtml
@@ -49,7 +49,7 @@ Annotations are so anyone, including you, can help the requester with their requ
<li> Ideas on what <strong>other documents to request</strong> which the authority may hold. </li>
<% end %>
<% if [ 'rejected' ].include?(@info_request.described_state) %>
- <li> Advise on whether the <strong>rejection is legal</strong>, and how to complain about it if not. </li>
+ <li> Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not. </li>
<% end %>
<% if [ 'internal_review' ].include?(@info_request.described_state) %>
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml
index 1fc93b099..9993e733a 100644
--- a/app/views/general/search.rhtml
+++ b/app/views/general/search.rhtml
@@ -127,7 +127,7 @@
<table class="status_table">
<tr><td><strong><%=search_link('status:waiting_response')%></strong></td><td> Waiting for the public authority to reply </td></tr>
<tr><td><strong><%=search_link('status:not_held')%></strong></td><td> The public authority does not have the information requested </td></tr>
- <tr><td><strong><%=search_link('status:rejected')%></strong></td><td> The request was rejected by the public authority </td></tr>
+ <tr><td><strong><%=search_link('status:rejected')%></strong></td><td> The request was refused by the public authority </td></tr>
<tr><td><strong><%=search_link('status:partially_successful')%></strong></td><td> Some of the information requested has been received </td></tr>
<tr><td><strong><%=search_link('status:successful')%></strong></td><td> All of the information requested has been received </td></tr>
<tr><td><strong><%=search_link('status:waiting_clarification')%></strong></td><td> The public authority would like part of the request explained </td></tr>
diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml
index 4f1c6c288..5ff22b23f 100644
--- a/app/views/help/about.rhtml
+++ b/app/views/help/about.rhtml
@@ -164,7 +164,7 @@ you have specifically agreed in advance to pay. <a
details</a> from the Information Commissioner.
</p>
-<p>Sometimes an authority will reject your request, saying that the cost
+<p>Sometimes an authority will refuse your request, saying that the cost
of handling it exceeds £600 (for central government) or £450 (for all other
public authorities). At this point you can refine your
request. e.g. it would be much cheaper for an authority to tell you the amount
diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml
index cd302a81a..432c00f2e 100644
--- a/app/views/help/unhappy.rhtml
+++ b/app/views/help/unhappy.rhtml
@@ -14,7 +14,7 @@ to your request '<%=request_link(@info_request) %>'?
<ul>
<li>You didn't get a reply within 20 working days</li>
<li>You did not get all of the information that you requested <strong>or</strong></li>
-<li>Your request was rejected, but without a reason valid under the law</li>
+<li>Your request was refused, but without a reason valid under the law</li>
</ul>
<p>... you can</p>
@@ -86,7 +86,7 @@ get the information by <strong>other means...</strong></p>
<ul>
<li>Make a <strong>new FOI request</strong> for summary information, or for
-documentation relating indirectly to matters in your rejected request.
+documentation relating indirectly to matters in your refused request.
<a href="/help/contact">Ask us for ideas</a> if you're stuck.</li>
<li>If any <strong>other public authorities</strong> or publicly owned companies are involved,
then make FOI requests to them.</li>
diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml
index 4496fddb6..a91231ae8 100644
--- a/app/views/request/_describe_state.rhtml
+++ b/app/views/request/_describe_state.rhtml
@@ -58,7 +58,7 @@
</div>
<div>
<%= radio_button "incoming_message", "described_state", "rejected", :id => 'rejected' + id_suffix %>
- <label for="rejected<%=id_suffix%>">My request has been <strong>rejected</strong></label>
+ <label for="rejected<%=id_suffix%>">My request has been <strong>refused</strong></label>
</div>
<hr> <!------------------------------------------------>
diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml
index 866e90142..66f64c27a 100644
--- a/app/views/request/_other_describe_state.rhtml
+++ b/app/views/request/_other_describe_state.rhtml
@@ -54,7 +54,7 @@
</div>
<div>
<%= radio_button "incoming_message", "described_state", "rejected", :id => 'rejected' + id_suffix %>
- <label for="rejected<%=id_suffix%>">The request has been <strong>rejected</strong></label>
+ <label for="rejected<%=id_suffix%>">The request has been <strong>refused</strong></label>
</div>
<hr> <!------------------------------------------------>
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 02f68bf21..97dc32512 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -83,7 +83,7 @@
<% elsif @status == 'not_held' %>
<%= public_body_link(@info_request.public_body) %> <strong>did not have</strong> the information requested.
<% elsif @status == 'rejected' %>
- The request was <strong>rejected</strong> by <%= public_body_link(@info_request.public_body) %>.
+ The request was <strong>refused</strong> by <%= public_body_link(@info_request.public_body) %>.
<% elsif @status == 'successful' %>
The request was <strong>successful</strong>.
<% elsif @status == 'partially_successful' %>
diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb
index 6be7b9cea..c77920905 100644
--- a/spec/models/request_mailer_spec.rb
+++ b/spec/models/request_mailer_spec.rb
@@ -239,7 +239,7 @@ describe RequestMailer, 'when sending mail when someone has updated an old uncla
:law_used_full => 'Freedom of Information',
:title => 'Test request',
:public_body => @public_body,
- :display_status => 'Rejected.',
+ :display_status => 'Refused.',
:url_title => 'test_request')
@mail = RequestMailer.create_old_unclassified_updated(@info_request)
end
@@ -249,7 +249,7 @@ describe RequestMailer, 'when sending mail when someone has updated an old uncla
end
it 'should tell them what status was picked' do
- @mail.body.should match(/"rejected."/)
+ @mail.body.should match(/"refused."/)
end
it 'should contain the request path' do
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-27 04:37:07 +0000