Merge branch 'master' into migrate_to_catalyst

Conflicts:
	.gitignore
	commonlib
	conf/packages
	perllib/FixMyStreet/Map.pm
	templates/website/cobrands/barnet/footer
	web/confirm.cgi
	web/css/core.css
	web/import.cgi
	web/index.cgi

1 files changed, 2 insertions, 3 deletions

diff --git a/web/reports.cgi b/web/reports.cgi
index 784c52917..22dbe344a 100755
--- a/web/reports.cgi
+++ b/web/reports.cgi
@@ -61,7 +61,6 @@ sub main {
         my $areas_f = mySociety::MaPit::call('areas', $fylke, type => \@area_types);
         if (keys %$areas_f == 1) {
             ($fylke) = values %$areas_f;
-            $kommune = decode_utf8($kommune);
             foreach (values %$areas_k) {
                 if ($_->{name} eq $kommune && $_->{parent_area} == $fylke->{id}) {
                     $one_council = $_;
@@ -84,7 +83,7 @@ sub main {
             $area_name = $one_council->{name};
         } else {
             foreach (keys %$areas) {
-                if ($areas->{$_}->{name} =~ /^\Q$q_council\E (Borough|City|District|County) Council$/) {
+                if ($areas->{$_}->{name} eq $q_council || $areas->{$_}->{name} =~ /^\Q$q_council\E (Borough|City|District|County) Council$/) {
                     $one_council = $areas->{$_};
                     $area_type = $areas->{$_}->{type};
                     $area_name = $q_council;
@@ -331,7 +330,7 @@ sub list_problems {
         $out .= '<li><a href="' . $url . '">';
         $out .= ent($_->{title});
         $out .= '</a>';
-        $out .= ' <small>(sent to both)</small>' if $_->{councils}>1;
+        $out .= ' <small>' . _('(sent to both)') . '</small>' if $_->{councils}>1;
         $out .= ' <small>' . _('(not sent to council)') . '</small>' if $_->{councils}==0 && $q->{site} ne 'emptyhomes';
         $out .= '<br><small>' . ent($_->{detail}) . '</small>' if $all;
         $out .= '</li>';