Merge branch 'hotfix/0.39.1.5'

mysociety · Sep 15, 2021 · 645026a · 645026a
2 parents a9892ad + 902a552
commit 645026a
Show file tree

Hide file tree

Showing 141 changed files with 710 additions and 844 deletions.
diff --git a/app/mailers/survey_mailer.rb b/app/mailers/survey_mailer.rb
@@ -23,10 +23,7 @@ def survey_alert(info_request)
     mail(
       to: info_request.user.name_and_email,
       from: contact_from_name_and_email,
-      subject: _('A survey about your recent {{law_used_full}} request ' \
-                 '({{site_name}})',
-                 law_used_full: info_request.legislation.to_s(:full),
-                 site_name: site_name.html_safe)
+      subject: _('A survey about your recent Freedom of Information request')
     )
   end
 

diff --git a/app/views/notification_mailer/response_notification.text.erb b/app/views/notification_mailer/response_notification.text.erb
@@ -1,7 +1,7 @@
-<%= _('You have a new response to the {{law_used_full}} request',
-      law_used_full: @info_request.legislation.to_s(:full).html_safe) %>
-'<%= @info_request.title %>' <%=_('that you made to') %>
-<%= @info_request.public_body.name %>.
+<%= _("You have a new response to the {{law_used_full}} request '{{request_title}}' that you made to {{public_body_name}}.",
+      law_used_full: @info_request.legislation.to_s(:full).html_safe,
+      request_title: @info_request.title.html_safe,
+      public_body_name: @info_request.public_body.name.html_safe) %>
 
 <%= _('To view the response, click on the link below.') %>
 

diff --git a/app/views/request_mailer/new_response.text.erb b/app/views/request_mailer/new_response.text.erb
@@ -1,7 +1,7 @@
-<%= _('You have a new response to the {{law_used_full}} request',
-      law_used_full: @info_request.legislation.to_s(:full).html_safe) %>
-'<%= @info_request.title %>' <%=_('that you made to') %>
-<%= @info_request.public_body.name %>.
+<%= _("You have a new response to the {{law_used_full}} request '{{request_title}}' that you made to {{public_body_name}}.",
+      law_used_full: @info_request.legislation.to_s(:full).html_safe,
+      request_title: @info_request.title.html_safe,
+      public_body_name: @info_request.public_body.name.html_safe) %>
 
 <%= _('To view the response, click on the link below.') %>
 

diff --git a/app/views/survey_mailer/survey_alert.text.erb b/app/views/survey_mailer/survey_alert.text.erb
@@ -3,9 +3,8 @@
       public_body_name: @info_request.public_body.name,
       site_name: site_name.html_safe) %>
 
-<%= _('We would like to know more about you, and your experience making an ' \
-      '{{law_used_full}} request through the site.',
-      law_used_full: @info_request.legislation.to_s(:full)) %>
+<%= _('We would like to know more about you, and your experience making a ' \
+      'Freedom of Information request through the site.') %>
 
 <%= _('If you can spare a few minutes to complete our short survey, it will ' \
       'help us make the site better. Just follow the link below.') %>

diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.39.1.4'
+ALAVETELI_VERSION = '0.39.1.5'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -1,3 +1,10 @@
+# 0.39.1.5
+
+## Highlighted Features
+
+* Update survey mailer strings for easier translation (Graeme Porteous)
+* Updated translations from Transifex (Graeme Porteous)
+
 # 0.39.1.4
 
 ## Highlighted Features

diff --git a/locale/af_ZA/app.po b/locale/af_ZA/app.po
@@ -24,12 +24,13 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-20 14:09+0100\n"
-"PO-Revision-Date: 2021-07-20 13:35+0000\n"
+"POT-Creation-Date: 2021-09-14 12:40+0100\n"
+"PO-Revision-Date: 2021-09-14 16:15+0000\n"
 "Last-Translator: Graeme Porteous <[email protected]>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/mysociety/al"
 "aveteli/language/af_ZA/)\n"
@@ -348,7 +349,7 @@ msgstr ""
 msgid "A strange response, required attention by the {{site_name}} team"
 msgstr ""
 
-msgid "A survey about your recent {{law_used_full}} request ({{site_name}})"
+msgid "A survey about your recent Freedom of Information request"
 msgstr ""
 
 msgid "A {{site_name}} user"
@@ -3442,7 +3443,7 @@ msgstr ""
 msgid "We will not reveal your email addresses to anybody unless you or the law tell us to."
 msgstr ""
 
-msgid "We would like to know more about you, and your experience making an {{law_used_full}} request through the site."
+msgid "We would like to know more about you, and your experience making a Freedom of Information request through the site."
 msgstr ""
 
 msgid "We'll drop you an email as soon as your request gets a response."
@@ -3677,9 +3678,6 @@ msgstr[1] ""
 msgid "You can't update your profile text at this time."
 msgstr ""
 
-msgid "You have a new response to the {{law_used_full}} request"
-msgstr ""
-
 msgid "You have a new response to the {{law_used_full}} request '{{request_title}}' that you made to {{public_body_name}}."
 msgstr ""
 
@@ -4141,9 +4139,6 @@ msgstr ""
 msgid "successful requests"
 msgstr ""
 
-msgid "that you made to"
-msgstr ""
-
 msgid "the main FOI contact address for {{public_body}}"
 msgstr ""
 
@@ -4369,6 +4364,9 @@ msgstr[1] ""
 msgid "{{site_name}} has identified {{authority_name}} may have refused all or part of your request under <strong>{{refusals}}</strong>."
 msgstr ""
 
+msgid "{{site_name}} login link"
+msgstr ""
+
 msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority."
 msgstr ""
 

diff --git a/locale/aln/app.po b/locale/aln/app.po
@@ -24,14 +24,15 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 # Valon <[email protected]>, 2011
 # Valon <[email protected]>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-20 14:09+0100\n"
-"PO-Revision-Date: 2021-07-20 13:35+0000\n"
+"POT-Creation-Date: 2021-09-14 12:40+0100\n"
+"PO-Revision-Date: 2021-09-14 16:15+0000\n"
 "Last-Translator: Graeme Porteous <[email protected]>\n"
 "Language-Team: Albanian Gheg (http://www.transifex.com/mysociety/alaveteli/lan"
 "guage/aln/)\n"
@@ -350,7 +351,7 @@ msgstr ""
 msgid "A strange response, required attention by the {{site_name}} team"
 msgstr ""
 
-msgid "A survey about your recent {{law_used_full}} request ({{site_name}})"
+msgid "A survey about your recent Freedom of Information request"
 msgstr ""
 
 msgid "A {{site_name}} user"
@@ -3444,7 +3445,7 @@ msgstr ""
 msgid "We will not reveal your email addresses to anybody unless you or the law tell us to."
 msgstr ""
 
-msgid "We would like to know more about you, and your experience making an {{law_used_full}} request through the site."
+msgid "We would like to know more about you, and your experience making a Freedom of Information request through the site."
 msgstr ""
 
 msgid "We'll drop you an email as soon as your request gets a response."
@@ -3679,9 +3680,6 @@ msgstr[1] ""
 msgid "You can't update your profile text at this time."
 msgstr ""
 
-msgid "You have a new response to the {{law_used_full}} request"
-msgstr ""
-
 msgid "You have a new response to the {{law_used_full}} request '{{request_title}}' that you made to {{public_body_name}}."
 msgstr ""
 
@@ -4143,9 +4141,6 @@ msgstr ""
 msgid "successful requests"
 msgstr ""
 
-msgid "that you made to"
-msgstr ""
-
 msgid "the main FOI contact address for {{public_body}}"
 msgstr ""
 
@@ -4371,6 +4366,9 @@ msgstr[1] ""
 msgid "{{site_name}} has identified {{authority_name}} may have refused all or part of your request under <strong>{{refusals}}</strong>."
 msgstr ""
 
+msgid "{{site_name}} login link"
+msgstr ""
+
 msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority."
 msgstr ""
 

diff --git a/locale/app.pot b/locale/app.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-20 14:09+0100\n"
+"POT-Creation-Date: 2021-09-14 12:40+0100\n"
 "PO-Revision-Date: 2011-10-09 01:10+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -325,7 +325,7 @@ msgstr ""
 msgid "A strange response, required attention by the {{site_name}} team"
 msgstr ""
 
-msgid "A survey about your recent {{law_used_full}} request ({{site_name}})"
+msgid "A survey about your recent Freedom of Information request"
 msgstr ""
 
 msgid "A {{site_name}} user"
@@ -3419,7 +3419,7 @@ msgstr ""
 msgid "We will not reveal your email addresses to anybody unless you or the law tell us to."
 msgstr ""
 
-msgid "We would like to know more about you, and your experience making an {{law_used_full}} request through the site."
+msgid "We would like to know more about you, and your experience making a Freedom of Information request through the site."
 msgstr ""
 
 msgid "We'll drop you an email as soon as your request gets a response."
@@ -3654,9 +3654,6 @@ msgstr[1] ""
 msgid "You can't update your profile text at this time."
 msgstr ""
 
-msgid "You have a new response to the {{law_used_full}} request"
-msgstr ""
-
 msgid "You have a new response to the {{law_used_full}} request '{{request_title}}' that you made to {{public_body_name}}."
 msgstr ""
 
@@ -4118,9 +4115,6 @@ msgstr ""
 msgid "successful requests"
 msgstr ""
 
-msgid "that you made to"
-msgstr ""
-
 msgid "the main FOI contact address for {{public_body}}"
 msgstr ""
 
@@ -4346,6 +4340,9 @@ msgstr[1] ""
 msgid "{{site_name}} has identified {{authority_name}} may have refused all or part of your request under <strong>{{refusals}}</strong>."
 msgstr ""
 
+msgid "{{site_name}} login link"
+msgstr ""
+
 msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority."
 msgstr ""
 

diff --git a/locale/ar/app.po b/locale/ar/app.po
@@ -24,6 +24,7 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 # Aladdin El-Haraty <[email protected]>, 2012
 # Aladdin El-Haraty <[email protected]>, 2012
 # Aladdin El-Haraty <[email protected]>, 2012
@@ -43,8 +44,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-20 14:09+0100\n"
-"PO-Revision-Date: 2021-07-20 13:37+0000\n"
+"POT-Creation-Date: 2021-09-14 12:40+0100\n"
+"PO-Revision-Date: 2021-09-14 16:15+0000\n"
 "Last-Translator: Graeme Porteous <[email protected]>\n"
 "Language-Team: Arabic (http://www.transifex.com/mysociety/alaveteli/language/a"
 "r/)\n"
@@ -397,7 +398,7 @@ msgstr ""
 msgid "A strange response, required attention by the {{site_name}} team"
 msgstr ""
 
-msgid "A survey about your recent {{law_used_full}} request ({{site_name}})"
+msgid "A survey about your recent Freedom of Information request"
 msgstr ""
 
 msgid "A {{site_name}} user"
@@ -3595,7 +3596,7 @@ msgstr ""
 " لن نكشف عناوين بريدك الالكتروني لاحد الا  اذا قررت انت\n"
 "او القانون عكس ذلك ."
 
-msgid "We would like to know more about you, and your experience making an {{law_used_full}} request through the site."
+msgid "We would like to know more about you, and your experience making a Freedom of Information request through the site."
 msgstr ""
 
 msgid "We'll drop you an email as soon as your request gets a response."
@@ -3838,9 +3839,6 @@ msgstr[1] ""
 msgid "You can't update your profile text at this time."
 msgstr ""
 
-msgid "You have a new response to the {{law_used_full}} request"
-msgstr ""
-
 msgid "You have a new response to the {{law_used_full}} request '{{request_title}}' that you made to {{public_body_name}}."
 msgstr ""
 
@@ -4322,9 +4320,6 @@ msgstr "صيغة التاريخ البسيطة"
 msgid "successful requests"
 msgstr "طلبات ناجحة"
 
-msgid "that you made to"
-msgstr "الذي قمت به ل"
-
 msgid "the main FOI contact address for {{public_body}}"
 msgstr "عنوان الاتصال بحرية النفاذ للمعلومة  {{public_body}}"
 
@@ -4553,6 +4548,9 @@ msgstr[1] ""
 msgid "{{site_name}} has identified {{authority_name}} may have refused all or part of your request under <strong>{{refusals}}</strong>."
 msgstr ""
 
+msgid "{{site_name}} login link"
+msgstr ""
+
 msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority."
 msgstr "{{site_name}} ارسل طلبات جديدة ل <strong>{{request_email}}</strong> بخصوص هذه السلطة."
 

diff --git a/locale/bg/app.po b/locale/bg/app.po
@@ -24,6 +24,7 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 # Anton Stoychev <[email protected]>, 2013
 # Anton Stoychev <[email protected]>, 2013
 # Liz Conlan <[email protected]>, 2018
@@ -34,8 +35,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-20 14:09+0100\n"
-"PO-Revision-Date: 2021-07-20 13:37+0000\n"
+"POT-Creation-Date: 2021-09-14 12:40+0100\n"
+"PO-Revision-Date: 2021-09-14 16:15+0000\n"
 "Last-Translator: Graeme Porteous <[email protected]>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/mysociety/alaveteli/languag"
 "e/bg/)\n"
@@ -390,7 +391,7 @@ msgstr ""
 msgid "A strange response, required attention by the {{site_name}} team"
 msgstr ""
 
-msgid "A survey about your recent {{law_used_full}} request ({{site_name}})"
+msgid "A survey about your recent Freedom of Information request"
 msgstr ""
 
 msgid "A {{site_name}} user"
@@ -3621,7 +3622,7 @@ msgstr ""
 "Ние няма да предоставим имейл адресите Ви на никого, освен ако Вие\n"
 "или закон ни нареди това."
 
-msgid "We would like to know more about you, and your experience making an {{law_used_full}} request through the site."
+msgid "We would like to know more about you, and your experience making a Freedom of Information request through the site."
 msgstr ""
 
 msgid "We'll drop you an email as soon as your request gets a response."
@@ -3864,9 +3865,6 @@ msgstr[1] ""
 msgid "You can't update your profile text at this time."
 msgstr ""
 
-msgid "You have a new response to the {{law_used_full}} request"
-msgstr ""
-
 msgid "You have a new response to the {{law_used_full}} request '{{request_title}}' that you made to {{public_body_name}}."
 msgstr ""
 
@@ -4354,9 +4352,6 @@ msgstr ""
 msgid "successful requests"
 msgstr "успешни заявления"
 
-msgid "that you made to"
-msgstr "което направихте до"
-
 msgid "the main FOI contact address for {{public_body}}"
 msgstr "основният адрес за контакти за ДдИ на {{public_body}}"
 
@@ -4588,6 +4583,9 @@ msgstr[1] ""
 msgid "{{site_name}} has identified {{authority_name}} may have refused all or part of your request under <strong>{{refusals}}</strong>."
 msgstr ""
 
+msgid "{{site_name}} login link"
+msgstr ""
+
 msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority."
 msgstr "{{site_name}} изпраща новите заявления до <strong>{{request_email}}</strong> за този орган."