aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--app/models/foi_attachment.rb3
-rw-r--r--app/views/general/_localised_datepicker.html.erb10
-rw-r--r--app/views/help/officers.html.erb6
-rw-r--r--app/views/help/privacy.html.erb2
-rw-r--r--app/views/help/requesting.html.erb2
-rw-r--r--config/general.yml-example5
-rw-r--r--doc/THEMES.md2
-rw-r--r--lib/acts_as_xapian/README.txt2
-rw-r--r--lib/world_foi_websites.rb2
-rw-r--r--locale/cy/app.po6
11 files changed, 24 insertions, 18 deletions
diff --git a/README.md b/README.md
index 1a2aeee05..a860470a4 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
This is an open source project to create a standard, internationalised
platform for making Freedom of Information (FOI) requests in different
countries around the world. The software started off life as
-[WhatDoTheyKnow](http://www.whatdotheyknow.com), a website produced by
+[WhatDoTheyKnow](https://www.whatdotheyknow.com), a website produced by
[mySociety](http://mysociety.org) for making FOI requests in the UK.
We hope that by joining forces between teams across the world, we can
diff --git a/app/models/foi_attachment.rb b/app/models/foi_attachment.rb
index acbfc8a34..ecd4a1872 100644
--- a/app/models/foi_attachment.rb
+++ b/app/models/foi_attachment.rb
@@ -359,7 +359,8 @@ class FoiAttachment < ActiveRecord::Base
ret = "<html><head></head><body>";
if self.has_google_docs_viewer?
wrapper_id = "wrapper_google_embed"
- ret = ret + "<iframe src='http://docs.google.com/viewer?url=<attachment-url-here>&embedded=true' width='100%' height='100%' style='border: none;'></iframe>";
+ protocol = AlaveteliConfiguration::force_ssl ? 'https' : 'http'
+ ret = ret + "<iframe src='#{protocol}://docs.google.com/viewer?url=<attachment-url-here>&embedded=true' width='100%' height='100%' style='border: none;'></iframe>";
else
ret = ret + "<p>Sorry, we were unable to convert this file to HTML. Please use the download link at the top right.</p>"
end
diff --git a/app/views/general/_localised_datepicker.html.erb b/app/views/general/_localised_datepicker.html.erb
index ec6593ea0..ee3206957 100644
--- a/app/views/general/_localised_datepicker.html.erb
+++ b/app/views/general/_localised_datepicker.html.erb
@@ -1,16 +1,16 @@
<script type="text/javascript">
$(function() {
$(".use-datepicker").datepicker(
- {closeText: '<%= _("Done") %>',
- prevText: '<%= _("Prev") %>',
- nextText: '<%= _("Next") %>',
- currentText: '<%= _("Today") %>',
+ {closeText: '<%= j _("Done") %>',
+ prevText: '<%= j _("Prev") %>',
+ nextText: '<%= j _("Next") %>',
+ currentText: '<%= j _("Today") %>',
monthNames: <%= raw I18n.translate('date.month_names')[1..-1].to_json %>,
monthNamesShort: <%= raw I18n.translate('date.abbr_month_names')[1..-1].to_json %>,
dayNames: <%= raw I18n.translate('date.day_names').to_json %>,
dayNamesShort: <%= raw I18n.translate('date.abbr_day_names').to_json %>,
dayNamesMin: <%= raw I18n.translate('date.abbr_day_names').collect{|x| x[0..0]}.to_json %>,
- weekHeader: '<%= _("Wk") %>',
+ weekHeader: '<%= j _("Wk") %>',
dateFormat: '<%= I18n.translate('date.formats.default').sub("%Y", "yy").sub("%m", "mm").sub("%d", "dd").gsub("-", "/") %>'}
);
});
diff --git a/app/views/help/officers.html.erb b/app/views/help/officers.html.erb
index 6db706f78..a227b01c5 100644
--- a/app/views/help/officers.html.erb
+++ b/app/views/help/officers.html.erb
@@ -52,7 +52,7 @@
<dt id="email_only">An email isn't a sufficient address for an FOI request! <a href="#email_only">#</a> </dt>
<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
+ <a href="https://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.
</dd>
@@ -66,7 +66,7 @@
via WhatDoTheyKnow. 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>
+ <a href="https://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>
@@ -135,7 +135,7 @@
<li>If the day the request email was delivered was a non-working day, we count
the next working day as "day one". Delivery is delivery, even if it happened on
- the weekend. Some authorities <a href="http://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li>
+ the weekend. Some authorities <a href="https://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li>
<li>Requesters are encouraged to mark when they have <strong>clarified</strong>
their request so the clock resets, but sometimes they get this wrong. If you
diff --git a/app/views/help/privacy.html.erb b/app/views/help/privacy.html.erb
index 8e5293892..3e26907fd 100644
--- a/app/views/help/privacy.html.erb
+++ b/app/views/help/privacy.html.erb
@@ -111,7 +111,7 @@ address should be treated as the return address."
<dd>
<p>If an authority only has a paper copy of the information that you want,
they may ask you for a postal address. To start with, try persuading them
-to scan in the documents for you. You can even <a href="http://www.whatdotheyknow.com/request/car_parking_charges_policy_and_a#outgoing-532">offer to gift them a scanner</a>, which in that particular case
+to scan in the documents for you. You can even <a href="https://www.whatdotheyknow.com/request/car_parking_charges_policy_and_a#outgoing-532">offer to gift them a scanner</a>, which in that particular case
embarrassed the authority into finding one they had already.</p>
<p>If that doesn't work, and you want to provide your postal address privately
diff --git a/app/views/help/requesting.html.erb b/app/views/help/requesting.html.erb
index e7cfdd199..d9397d763 100644
--- a/app/views/help/requesting.html.erb
+++ b/app/views/help/requesting.html.erb
@@ -235,7 +235,7 @@
<dt id="eir">Why can I only request information about the environment from some authorities? <a href="#eir">#</a> </dt>
<dd>
- <p>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>,
+ <p>Some public authorities, such as <a href="https://www.whatdotheyknow.com/body/south_east_water">South East Water</a>,
don't come under the Freedom of Information Act, but do come under another law called
the Environmental Information Regulations (EIR).
</p>
diff --git a/config/general.yml-example b/config/general.yml-example
index 2bead2021..01936e648 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -172,6 +172,11 @@ VARNISH_HOST: localhost
# Adding a value here will enable Google Analytics on all non-admin pages for non-admin users.
GA_CODE: ''
+# We need to add the WDTK survey variables here, or else the deployment
+# system will cry.
+SURVEY_SECRET: ''
+SURVEY_URL: ''
+
# If you want to override *all* the public body request emails with your own
# email so that request emails that would normally go to the public body
# go to you, then uncomment below and fill in your email.
diff --git a/doc/THEMES.md b/doc/THEMES.md
index d6109cdc5..8a4828a99 100644
--- a/doc/THEMES.md
+++ b/doc/THEMES.md
@@ -7,7 +7,7 @@ inserting your own logo and colour scheme. You may also want to tweak
the different states that a request can go through. You'll also want
to edit the categories that public bodies can appear in (i.e. the
groupings on the left hand side of the
-"[View authorities](http://www.whatdotheyknow.com/body/list/all)" page
+"[View authorities](https://www.whatdotheyknow.com/body/list/all)" page
on WhatDoTheyKnow.
There may also be other things you want to customise; drop a line on
diff --git a/lib/acts_as_xapian/README.txt b/lib/acts_as_xapian/README.txt
index a1d22ef3f..d58423463 100644
--- a/lib/acts_as_xapian/README.txt
+++ b/lib/acts_as_xapian/README.txt
@@ -33,7 +33,7 @@ alternative to acts_as_solr, acts_as_ferret, Ultrasphinx, acts_as_indexed,
acts_as_searchable or acts_as_tsearch.
acts_as_xapian is deployed in production on these websites.
-* "WhatDoTheyKnow":http://www.whatdotheyknow.com
+* "WhatDoTheyKnow":https://www.whatdotheyknow.com
* "MindBites":http://www.mindbites.com
The section "c. Comparison to acts_as_solr" below will give you an idea of
diff --git a/lib/world_foi_websites.rb b/lib/world_foi_websites.rb
index 50976c897..eb707a103 100644
--- a/lib/world_foi_websites.rb
+++ b/lib/world_foi_websites.rb
@@ -5,7 +5,7 @@ class WorldFOIWebsites
{:name => "WhatDoTheyKnow",
:country_name => "United Kingdom",
:country_iso_code => "GB",
- :url => "http://www.whatdotheyknow.com"},
+ :url => "https://www.whatdotheyknow.com"},
{:name => "Informata Zyrtare",
:country_name => "Kosova",
:country_iso_code => "XK",
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 4a82d1f66..88f03a98c 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -20,7 +20,7 @@ msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-08 12:10+0000\n"
-"PO-Revision-Date: 2014-01-24 09:25+0000\n"
+"PO-Revision-Date: 2014-01-27 11:01+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/alaveteli/language/cy/)\n"
"Language: cy\n"
@@ -1273,7 +1273,7 @@ msgid "MailServerLog|Order"
msgstr "MailServerLog|Archeb"
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
-msgstr "Gwnewch <strong>Cais Rhyddid Gwybodaeth</strong> newydd"
+msgstr "Gwnewch <strong>Cais<br/>Rhyddid<br/>Gwybodaeth</strong><br/>newydd"
msgid "Make a request"
msgstr "Gwneud cais"
@@ -2999,7 +2999,7 @@ msgid "You may be able to find\\n one on their website, or by phoning them up
msgstr "Efallai y byddwch yn gallu dod o hyd i un ar eu gwefan, neu drwy eu ffonio nhw a gofyn. Os llwyddwch i ddod o hyd i un, <a href=\"{{url}}\"> anfonwch e atom</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
-msgstr "Efallai y byddwch yn gallu dod o hyd i un ar eu gwefan, neu drwy eu ffonio nhw a gofyn. Os llwyddwch i ddod o hyd i un, <a href=\"{{url}}\"> anfonwch e atom</a>."
+msgstr "Efallai y byddwch yn gallu dod o hyd i un ar eu gwefan, neu drwy eu ffonio nhw a gofyn. Os llwyddwch i ddod o hyd i un, <a href=\"{{help_url}}\"> anfonwch e atom</a>."
msgid "You need to be logged in to change the text about you on your profile."
msgstr "Rhaid i chi fod wedi mewngofnodi i newid y testun amdanoch chi ar eich proffil."
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 15:14:11 +0000