Merge branch 'master' into develop

Gemfile.lock

@@ -247,7 +247,7 @@ GEM
     net-ssh (2.9.4)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    newrelic_rpm (6.7.0.359)
+    newrelic_rpm (6.8.0.360)
     nio4r (2.5.2)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)

Gemfile.rails_next.lock

@@ -254,7 +254,7 @@ GEM
     net-ssh (2.9.4)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    newrelic_rpm (6.7.0.359)
+    newrelic_rpm (6.8.0.360)
     nio4r (2.5.2)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)

config/initializers/alaveteli.rb

@@ -11,7 +11,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.36.1.1'
+ALAVETELI_VERSION = '0.37.0.0'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

doc/CHANGES.md

@@ -1,18 +1,27 @@
-# develop
+# 0.37.0.0
 
 ## Highlighted Features
 
 * Automatically run `db:seed` on deployment (Gareth Rees)
+* Highlight the importance of remembering OTP (Gareth Ress)
+* Updated world sites index with new Alaveteli installs (Jen Bramley)
+* Fetch MaxMind database weekly (Sam Pearson)
+* Link requests to news articles through citations (Graeme Porteous)
 * Account for new MaxMind license restrictions (Gareth Rees)
 * Fix HTML output in Zip download correspondence extract (Gareth Rees)
 * Clean up Censor Rule admin forms (Gareth Rees)
 * Improve flow of closing public body change requests (Gareth Rees)
-* Add targeted Pro marketing pages (Myfanwy Nixon, Martin Wright, Gareth Rees)
+* Fix usage statistics for new installations (Graeme Porteous)
 
 ## Highlighted Pro Features
 
+* Respect locale when composing batch request (Gareth Rees)
 * Add configurable `STRIPE_TAX_RATE` to correctly calculate gross amounts for
   Pro plans (Gareth Rees)
+* Improve handling of failed Stripe payments (Graeme Porteous)
+* Add CSV download for batch requests (Graeme Porteous)
+* Add targeted Pro marketing pages (Myfanwy Nixon, Martin Wright, Gareth Rees)
+* Fix embargoed requests email response notification (Graeme Porteous)
 
 ## Upgrade Notes
 
@@ -22,9 +31,24 @@
   `MAXMIND_LICENSE_KEY` in order to continue using the `GEOIP_DATABASE` setting.
   See https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
   for more information.
+* There are some database structure updates so remember to run
+  `bundle exec rails db:migrate`
 
 ### Changed Templates
 
+The following templates have been changed. Please update overrides in your theme
+to match the new templates.
+
+    app/views/alaveteli_pro/account_request/index.html.erb
+    app/views/alaveteli_pro/info_request_batches/_info_request_batch.html.erb
+    app/views/alaveteli_pro/info_requests/_sidebar.html.erb
+    app/views/request/_act.html.erb
+    app/views/request/_batch.html.erb
+    app/views/request/_incoming_correspondence.text.erb
+    app/views/request/_sidebar.html.erb
+    app/views/request/show.html.erb
+    app/views/request_mailer/new_response.text.erb
+
 # 0.36.0.2
 
 ## Highlighted Features
@@ -50,7 +74,7 @@
 * Add Facebook link to blog sidebar (Zarino Zappia)
 * Fix users updated at timestamps being inadvertently changed by background jobs
   (Graeme Porteous)
-* Fixed issue with YAML generated in old Alaveletli versions and stored in
+* Fixed issue with YAML generated in old Alaveteli versions and stored in
   InfoRequestEvent (Graeme Porteous)
 
 ## Highlighted Pro Features

locale/af_ZA/app.po

@@ -19,12 +19,13 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-14 10:15+0000\n"
-"PO-Revision-Date: 2019-11-11 16:57+0000\n"
+"POT-Creation-Date: 2020-02-10 15:57+0000\n"
+"PO-Revision-Date: 2020-02-10 15:36+0000\n"
 "Last-Translator: Graeme Porteous <graeme@mysociety.org>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/mysociety/alaveteli/language/af_ZA/)\n"
 "Language: af_ZA\n"
@@ -329,6 +330,9 @@ msgstr ""
 msgid "About {{count}} FOI requests found"
 msgstr ""
 
+msgid "Academic paper"
+msgstr ""
+
 msgid "Account closed at user request"
 msgstr ""
 
@@ -389,6 +393,9 @@ msgstr ""
 msgid "All of the information requested has been received"
 msgstr ""
 
+msgid "All responses will be published when the privacy period expires. We depend on you, the original requester, to evaluate them."
+msgstr ""
+
 msgid "All the options below can use <strong>status</strong> or <strong>latest_status</strong> before the colon. For example, <strong>status:not_held</strong> will match requests which have <em>ever</em> been marked as not held; <strong>latest_status:not_held</strong> will match only requests that are <em>currently</em> marked as not held."
 msgstr ""
 
@@ -518,6 +525,9 @@ msgstr ""
 msgid "ApplicationRecord|Circumstance"
 msgstr ""
 
+msgid "ApplicationRecord|Citable type"
+msgstr ""
+
 msgid "ApplicationRecord|Closed at"
 msgstr ""
 
@@ -1055,6 +1065,9 @@ msgstr ""
 msgid "Choose your profile photo"
 msgstr ""
 
+msgid "Citation successfully created."
+msgstr ""
+
 msgid "Clarification"
 msgstr ""
 
@@ -1816,6 +1829,9 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
+msgid "In the News"
+msgstr ""
+
 msgid "Include relevant links, such as to a campaign page, your blog or a twitter account. They will be made clickable. e.g."
 msgstr ""
 
@@ -1912,6 +1928,9 @@ msgstr ""
 msgid "Learn more &rarr;"
 msgstr ""
 
+msgid "Let us know"
+msgstr ""
+
 msgid "Let us know what you were doing when this message appeared and your browser and operating system type and version."
 msgstr ""
 
@@ -2032,10 +2051,10 @@ msgstr ""
 msgid "Needs status update"
 msgstr ""
 
-msgid "New Freedom of Information requests"
+msgid "New Citation"
 msgstr ""
 
-msgid "New censor rule"
+msgid "New Freedom of Information requests"
 msgstr ""
 
 msgid "New e-mail:"
@@ -2068,6 +2087,9 @@ msgstr ""
 msgid "Newest results first"
 msgstr ""
 
+msgid "News story"
+msgstr ""
+
 msgid "Next"
 msgstr ""
 
@@ -2293,6 +2315,9 @@ msgstr ""
 msgid "Please enable \"cookies\" to carry on"
 msgstr ""
 
+msgid "Please enter a Source URL"
+msgstr ""
+
 msgid "Please enter a password"
 msgstr ""
 
@@ -2364,6 +2389,9 @@ msgid_plural "Please read the recent responses and <strong>update the status</st
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Please select a type"
+msgstr ""
+
 msgid "Please select an authority"
 msgstr ""
 
@@ -2891,6 +2919,9 @@ msgstr ""
 msgid "Sorry, we're currently unable to sign up new users, please try again later"
 msgstr ""
 
+msgid "Source URL is too long"
+msgstr ""
+
 msgid "Source URL:"
 msgstr ""
 
@@ -2918,6 +2949,9 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
+msgid "Submit"
+msgstr ""
+
 msgid "Submit Search"
 msgstr ""
 
@@ -3050,12 +3084,18 @@ msgstr ""
 msgid "The Freedom of Information Act <strong>does not apply</strong> to"
 msgstr ""
 
+msgid "The URL where you found the article."
+msgstr ""
+
 msgid "The URL where you found the email address. This field is optional, but it would help us a lot if you can provide a link to a specific page on the authority's website that gives this address, as it will make it much easier for us to check."
 msgstr ""
 
 msgid "The accounts have been left as they previously were."
 msgstr ""
 
+msgid "The article references all requests in this batch"
+msgstr ""
+
 msgid "The authority do <strong>not have</strong> the information <small>(maybe they say who does)</small>"
 msgstr ""
 
@@ -3173,6 +3213,9 @@ msgstr ""
 msgid "The {{site_name}} team."
 msgstr ""
 
+msgid "Then you can add citations"
+msgstr ""
+
 msgid "Then you can cancel the alert."
 msgstr ""
 
@@ -3468,6 +3511,9 @@ msgstr ""
 msgid "To"
 msgstr ""
 
+msgid "To add a citation"
+msgstr ""
+
 msgid "To add a widget for <b>{{info_request_title}}</b>, copy and paste the following code to your web page:"
 msgstr ""
 
@@ -3868,6 +3914,9 @@ msgstr ""
 msgid "What next?"
 msgstr ""
 
+msgid "What type of article is it?"
+msgstr ""
+
 msgid "What's happened:"
 msgstr ""