Add changes needed to handle the same category in several areas/councils.

2 files changed, 10 insertions, 3 deletions

diff --git a/bin/send-reports b/bin/send-reports
index 3517f1ee0..90a6553eb 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -192,8 +192,13 @@ foreach my $row (@$unsent) {
         }
 
         $h{councils_name} = join(_(' and '), @dear);
-        $h{multiple} = @dear>1 ? "[ " . _("This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system.") . " ]\n\n"
-            : '';
+        if ($h{category} eq _('Other')) {
+            $h{multiple} = @dear>1 ? "[ " . _("This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system.") . " ]\n\n"
+                : '';
+        } else {
+            $h{multiple} = @dear>1 ? "[ " . _("This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue.") . " ]\n\n"
+                : '';
+        }
         $h{missing} = ''; 
         if ($missing) {
             my $name = $areas_info->{$missing}->{name};
diff --git a/web/index.cgi b/web/index.cgi
index c8fdb6158..c4b1fd9c6 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -579,11 +579,13 @@ please specify the closest point on land.')) unless %$all_councils;
         $category = _('Category:');
     } else {
         @$categories = sort { strcoll($a->{category}, $b->{category}) } @$categories;
+        my %seen;
         foreach (@$categories) {
             $council_ok{$_->{area_id}} = 1;
             next if $_->{category} eq _('Other');
             next if $q->{site} eq 'southampton' && $_->{category} eq 'Street lighting';
-            push @categories, $_->{category};
+            push @categories, $_->{category} unless $seen{$_->{category}};
+            $seen{$_->{category}} = 1;
         }
         if ($q->{site} eq 'scambs') {
             @categories = Page::scambs_categories();