Merge branch 'release/0.17' into rails-3-develop

Conflicts:
    config/general.yml-example
    locale/cy/app.po

config/initializers/alaveteli.rb

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

doc/CHANGES.md

@@ -1,18 +1,49 @@
-# rails-3-develop
+# Version 0.17
 
 ## Highlighted features
 
+* There is some initial support for making a request to multiple
+  authorities at once.
 * There is a new form for users to request that a new authority should
   be added, or to request an update to the contact email used for an
   authority. Site admins are emailed about these requests, and can
   resolve them from the admin interface.
+* For attachments where we rely on Google Document Viewer to display the
+  HTML version, link to the HTTPS version where the Alaveteli site is
+  served over HTTPS to avoid mixed content warnings and non display in
+  some browsers (Matthew Somerville).
+* The 'view requests' page now has some fragment caching backed by
+  memcached to speed up serving commonly used lists of requests - e.g
+  all successful requests. Like the caching introduced in release 0.16,
+  this is controlled by the `CACHE_FRAGMENTS` parameter in the config
+  file and will be on by default.
+* A user's annotations can now be seen on their admin page (Andrew
+  Black)
+* Better detection of the quoted text of a previous email in the HTML
+  parts of responses.
+* Fixed bugs in the profile photos (György Peng), calendar translations
+  (Mark Longair), the use of external utilities (Ian Chard), the
+  internal admin authority locale handling (Mark Longair), badly formed
+  attachment handling (Rowan Crawford).
 
 ## Upgrade notes
 
+* To use the batch request functionality, set the `ALLOW_BATCH_REQUESTS`
+  parameter to `true` in your config file. Once this is done, and the
+  install has been restarted, any user for whom 'Can make batch
+  requests' is checked in the admin interface should see a new link on
+  the 'Select an authority' page that allows them to make a batch
+  request.
 * If your theme overrides the help/requesting template, you should
   update the link in the section on requesting new authorities so the
   link points to `<%= new_change_request_path %>` instead of `<%=
   help_contact_path %>`.
+* If your site runs over HTTPS, some cached attachments may still
+  contain links to Google Document Viewer with 'http', not 'https'. You
+  can clear the cached attachments after upgrade, and they will be
+  created with links that use the correct protocol.
+* This release includes an update to the commonlib submodule - you
+  should be warned about this when running rails-post-deploy.
 
 # Version 0.16
 

locale/bg/app.po

@@ -5,14 +5,15 @@
 # Translators:
 # antitoxic <antitoxic@gmail.com>, 2013
 # antitoxic <antitoxic@gmail.com>, 2013
+# louisecrow <louise@mysociety.org>, 2014
 # Valentin Laskov <laskov@festa.bg>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-27 09:52+0000\n"
-"PO-Revision-Date: 2014-02-27 09:59+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"PO-Revision-Date: 2014-03-01 08:10+0000\n"
+"Last-Translator: Valentin Laskov <laskov@festa.bg>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/alaveteli/language/bg/)\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -549,7 +550,7 @@ msgid "Change your password {{site_name}}"
 msgstr "Промяна на паролата Ви {{site_name}}"
 
 msgid "Charity registration"
-msgstr ""
+msgstr "Регистрация на фондацията"
 
 msgid "Check for mistakes if you typed or copied the address."
 msgstr "Проверете за грешки ако сте написали или копирали адреса."
@@ -570,7 +571,7 @@ msgid "Clarify your FOI request - "
 msgstr "Пояснете Вашето Заявление за ДдИ - "
 
 msgid "Classify an FOI response from "
-msgstr ""
+msgstr "Класифициране на отговор за ДдИ от "
 
 msgid "Clear photo"
 msgstr "Премахни снимката"
@@ -1355,10 +1356,10 @@ msgid "Make a batch request"
 msgstr "Направете размножено заявление"
 
 msgid "Make a new EIR request"
-msgstr ""
+msgstr "Ново заявление за околната среда"
 
 msgid "Make a new FOI request"
-msgstr ""
+msgstr "Ново заявление за ДдИ"
 
 msgid "Make a new<br/>\\n  <strong>Freedom <span>of</span><br/>\\n  Information<br/>\\n  request</strong>"
 msgstr "Създаване на ново<br/>\\n  <strong>Заявление <span>за</span><br/>\\n  Достъп до<br/>\\n  Информация</strong>"
@@ -1481,7 +1482,7 @@ msgid "No similar requests found."
 msgstr "Няма намерени подобни резултати."
 
 msgid "No tracked things found."
-msgstr ""
+msgstr "Не са намерени следени неща."
 
 msgid "Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet."
 msgstr "До {{public_body_name}} все още никой не е отправил заявление за Достъп до информация чрез този сайт."
@@ -2630,7 +2631,7 @@ msgid "This authority no longer exists, so you cannot make a request to it."
 msgstr "Този орган вече не съществува, поради което не може да отправите заявление към него."
 
 msgid "This covers a very wide spectrum of information about the state of\\n            the <strong>natural and built environment</strong>, such as:"
-msgstr ""
+msgstr "Това покрива широк спектър информация относно състоянието\\n            на <strong>природната среда и строителството</strong>, като:"
 
 msgid "This external request has been hidden"
 msgstr "Външното заявление беше скрито"
@@ -3399,10 +3400,10 @@ msgid "[FOI #{{request}} email]"
 msgstr "[ДдИ #{{request}} имейл]"
 
 msgid "[{{public_body}} request email]"
-msgstr ""
+msgstr "[{{public_body}} имейл за заявления]"
 
 msgid "[{{site_name}} contact email]"
-msgstr ""
+msgstr "[{{site_name}} имейл за контакти]"
 
 msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]"
 msgstr "\\n\\n[ {{site_name}} съобщение: Горният текст е в непозволен формат. Някои странни символи бяха премахнати. ]"
@@ -3748,7 +3749,7 @@ msgid "{{title}} - a batch request"
 msgstr "{{title}} - размножено заявление"
 
 msgid "{{user_name}} (Account suspended)"
-msgstr ""
+msgstr "{{user_name}} (Блокирана регистрация)"
 
 msgid "{{user_name}} - Freedom of Information requests"
 msgstr "{{user_name}} - Заявления за Достъп до Обществена Информация"

locale/cy/app.po

@@ -21,7 +21,6 @@ msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-27 09:52+0000\n"
-"PO-Revision-Date: 2014-02-27 09:59+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"

locale/en_UG/app.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: version 0.0.1\n"
+"Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-27 09:52+0000\n"
 "PO-Revision-Date: 2014-01-31 09:14+0000\n"

locale/he_IL/app.po

@@ -8,7 +8,7 @@
 # Ram Ezrach <ram.ezrach@gmail.com>, 2013
 # rshlo <r@roishlomi.com>, 2013
 # rshlo <r@roishlomi.com>, 2013
-# yauzi <yair.uziel@gmail.com>, 2013
+# yauzi <yair.uziel@gmail.com>, 2013-2014
 # yauzi <yair.uziel@gmail.com>, 2013
 # yehuda <yehudab@gmail.com>, 2013
 # yehuda <yehudab@gmail.com>, 2013
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-27 09:52+0000\n"
-"PO-Revision-Date: 2014-02-27 09:59+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"PO-Revision-Date: 2014-03-03 17:37+0000\n"
+"Last-Translator: yauzi <yair.uziel@gmail.com>\n"
 "Language-Team: Hebrew (Israel) (http://www.transifex.com/projects/p/alaveteli/language/he_IL/)\n"
 "Language: he_IL\n"
 "MIME-Version: 1.0\n"
@@ -693,7 +693,10 @@ msgid "Dear {{name}},"
 msgstr "{{name}} יקר,"
 
 msgid "Dear {{public_body_name}},"
-msgstr "{{public_body_name}} נכבד, "
+msgstr ""
+"לכבוד הממונה על חוק חופש המידע ב{{public_body_name}},\n"
+"\n"
+"בהתאם לסעיף 7 לחוק חופש המידע, התשנ\"ח-1998 הריני לפנות אליכם כדלקמן:"
 
 msgid "Dear {{user_name}},"
 msgstr ""
@@ -3398,10 +3401,10 @@ msgid "Your {{site_name}} email alert"
 msgstr "התרעת הדוא\"ל שלכם מאתר {{site_name}} "
 
 msgid "Yours faithfully,"
-msgstr "שלכם במסירות,"
+msgstr "בתודה מראש על טיפולכם המסור בבקשה זו,"
 
 msgid "Yours sincerely,"
-msgstr "שלכם בכנות,"
+msgstr "בתודה מראש על טיפולכם המסור בבקשה זו,"
 
 msgid "Yours,"
 msgstr "בהוקרה,"