aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2016-03-02 14:58:23 +0000
committerMatthew Somerville <matthew@mysociety.org>2016-03-02 14:58:23 +0000
commit2fc65ef99e7591f4f570c5102f46583a0ce9a793 (patch)
treec30c3c3da3adb22261ddadccc4f6f26d7ba1af37 /templates
parent3ef78780e20e1ede6631a2243c7f337bea46b269 (diff)
Version 1.8.v1.8
Add things missing from README, pull from Transifex, merge in new translations, bump version number.
Diffstat (limited to 'templates')
-rw-r--r--templates/web/base/report/update/form_user_loggedout_password.html2
-rw-r--r--templates/web/zurich/admin/index.html6
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/web/base/report/update/form_user_loggedout_password.html b/templates/web/base/report/update/form_user_loggedout_password.html
index cd4433c47..103df1098 100644
--- a/templates/web/base/report/update/form_user_loggedout_password.html
+++ b/templates/web/base/report/update/form_user_loggedout_password.html
@@ -17,7 +17,7 @@
<div class="general-notes">
<p><strong>[% loc('Forgotten your password?') %]</strong>
- [% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
+ [% loc('Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
</div>
</div>
diff --git a/templates/web/zurich/admin/index.html b/templates/web/zurich/admin/index.html
index a51c7f6fe..275f50183 100644
--- a/templates/web/zurich/admin/index.html
+++ b/templates/web/zurich/admin/index.html
@@ -1,9 +1,9 @@
[% PROCESS 'admin/header.html' title=loc('Summary') -%]
<ul>
- <li>[% tprintf( loc('<strong>%d</strong> live problems'), total_problems_live ) %];
- [% tprintf( loc('from %d different users'), total_problems_users ) %]</li>
- <li>[% tprintf( loc('%d council contacts &ndash; %d confirmed, %d unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li>
+ <li>[% tprintf( loc('<strong>%s</strong> live problems'), total_problems_live ) %];
+ [% tprintf( loc('from %s different users'), total_problems_users ) %]</li>
+ <li>[% tprintf( loc('%s council contacts &ndash; %s confirmed, %s unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li>
</ul>
<h2>[% loc('Problem breakdown by state') %]</h2>