diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-06-15 17:01:53 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-06-15 17:01:53 +0100 |
| commit | 4a5db9ba96f454243dd952db34b279bbe664f766 (patch) | |
| tree | 85ee8b137d6c4c7aabac96f56035dec33415d738 | |
| parent | 861ff6f80acfc0e579e2ad4036242881392e6fde (diff) | |
| parent | 4e04d0f2abbbd368b9ad4148bb970c1c7130b30d (diff) | |
Merge branch 'master' of ssh://matthew@git.mysociety.org/data/git/public/fixmystreet
| -rw-r--r-- | t/i18n.t | 12 | ||||
| -rw-r--r-- | templates/web/default/admin/report_edit.html | 2 |
2 files changed, 13 insertions, 1 deletions
@@ -106,4 +106,16 @@ sub utf8_diag { \@NO_sorted, "sort strcoll correctly with use locale 'nb_NO'" ); } +subtest "check that code is only called once by in_gb_locale" => sub { + + my $scalar_counter = 0; + my $out = mySociety::Locale::in_gb_locale { $scalar_counter++ }; + is $scalar_counter, 1, "code called once in scalar context"; + + my $list_counter = 0; + my @out = mySociety::Locale::in_gb_locale { $list_counter++ }; + is $list_counter, 1, "code called once in list context"; + +}; + done_testing(); diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index ef083ca7e..9c38b014e 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -38,7 +38,7 @@ [% IF problem.photo %] [% photo = problem.get_photo_params %] -<li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]"> +<li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% c.cobrand.base_url %][% photo.url %]"> <input type="checkbox" id="remove_photo" name="remove_photo" value="1"> <label for="remove_photo">[% loc("Remove photo (can't be undone!)") %]</label></li> [% END %] |