diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-09-27 10:53:43 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-09-27 10:53:43 +0100 |
| commit | b519cf6566b285ce7cb1e6a65da873a1da693a0f (patch) | |
| tree | 867bd632cd7250f33154b38c8f127f27956d9d1b | |
| parent | 77f31e8c96c727ea5ab9cf217cfd924074e8f3ed (diff) | |
Ignore London in admin interface, text tweaks.
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 3 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Geocode/Bing.pm | 2 | ||||
| -rw-r--r-- | templates/web/default/report/new/councils_text_none.html | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 2aaa488d6..8949e9f4c 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -217,7 +217,8 @@ sub council_list : Path('council_list') : Args(0) { $c->stash->{edit_activity} = $edit_activity; - my @area_types = $c->cobrand->area_types; + # Not London, as treated separately + my @area_types = grep { $_ ne 'LBO' } $c->cobrand->area_types; my $areas = mySociety::MaPit::call('areas', \@area_types); my @councils_ids = sort { strcoll($areas->{$a}->{name}, $areas->{$b}->{name}) } keys %$areas; diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm index 4e12a7a7f..b804102c9 100644 --- a/perllib/FixMyStreet/Geocode/Bing.pm +++ b/perllib/FixMyStreet/Geocode/Bing.pm @@ -43,7 +43,7 @@ sub string { if (!$js) { return { error => _('Sorry, we could not parse that location. Please try again.') }; } elsif ($js =~ /BT\d/) { - return { error => _("We do not cover Northern Ireland, I'm afraid, as our licence doesn't include any maps for the region.") }; + return { error => _("We do not currently cover Northern Ireland, I'm afraid.") }; } $js = JSON->new->utf8->allow_nonref->decode($js); diff --git a/templates/web/default/report/new/councils_text_none.html b/templates/web/default/report/new/councils_text_none.html index f991e031f..06a4bbe49 100644 --- a/templates/web/default/report/new/councils_text_none.html +++ b/templates/web/default/report/new/councils_text_none.html @@ -7,9 +7,11 @@ "We do not yet have details for the councils that cover this location.", all_councils.size ); - +%] +[% loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); - +%] +[% tprintf( loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), all_council_names.join( loc(' or ') ), |