diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/default/admin/report_edit.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit-sdm.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index eaa1e404c..8eb12b50d 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -13,7 +13,11 @@ <li><label for='title'>[% loc('Subject:') %]</label> <input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></li> <li><label for='detail'>[% loc('Details:') %]</label> <textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> -<li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] ( [% loc('originally entered') %] [% problem.postcode | html %] , [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> + +<li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] +( [% tprintf( loc('originally entered: “%s”'), problem.postcode | html ) %], +[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> + <li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> <li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state" id="state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 89acfe238..0a0e4ed58 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -13,10 +13,12 @@ <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> <li>[% loc('Details:') %] [% problem.detail | html %] [% IF problem.extra.original_detail %] -<br>[% loc('originally entered') %]: “[% problem.extra.original_detail | html %]” +<br>[% tprintf( loc('originally entered: “%s”'), problem.extra.original_detail | html ) %] [% END %] </li> -<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) ([% loc('originally entered') %] ‘[% problem.postcode | html %]’, [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> +<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) +([% tprintf( loc('originally entered: “%s”'), problem.postcode | html ) %], +[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> <li>[% loc('Category:') %] [% problem.category | html %] </li> <li>[% loc('Name:') %] [% problem.name | html %] diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index aabd9d7c9..9c612065f 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -21,7 +21,7 @@ [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %] <li>[% loc('Details:') %] [% problem.detail | html %] [% IF problem.extra.original_detail %] - <br>[% loc('originally entered') %]: “[% problem.extra.original_detail | html %]” + <br>[% tprintf( loc('originally entered: “%s”'), problem.extra.original_detail | html ) %] [% END %] </li> [% ELSE %] @@ -29,12 +29,14 @@ <li><label for='detail'>[% loc('Details:') %]</label> <textarea name='detail' id='detail' cols=60 rows=5>[% problem.detail | html %]</textarea> [% IF problem.extra.original_detail %] - [% loc('originally entered') %]: “[% problem.extra.original_detail | html %]” + [% tprintf( loc('originally entered: “%s”'), problem.extra.original_detail | html ) %] [% END %] </li> [% END %] -<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) ([% loc('originally entered') %] ‘[% problem.postcode | html %]’, [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> +<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) +([% tprintf( loc('originally entered: “%s”'), problem.postcode | html ) %], +[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> <li>[% loc('Name:') %] [% problem.name | html %] <input type='hidden' name='name' id='name' value='[% problem.name | html %]'></li> <li>[% loc('Email:') %] [% problem.user.email | html %] <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'> |