Update reporting to use bodies.

4 files changed, 20 insertions, 20 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index f6d2dfd5f..994a245a0 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -468,14 +468,14 @@ sub format_postcode {
 
     return $postcode;
 }
-=head2 council_check
+=head2 area_check
 
-Paramters are COUNCILS, QUERY, CONTEXT. Return a boolean indicating whether
-COUNCILS pass any extra checks. CONTEXT is where we are on the site.
+Paramters are AREAS, QUERY, CONTEXT. Return a boolean indicating whether
+AREAS pass any extra checks. CONTEXT is where we are on the site.
 
 =cut
 
-sub council_check { return ( 1, '' ); }
+sub area_check { return ( 1, '' ); }
 
 =head2 all_councils_report
 
@@ -548,15 +548,15 @@ sub email_host {
     return 1;
 }
 
-=item remove_redundant_councils
+=item remove_redundant_areas
 
-Remove councils whose reports go to another council
+Remove areas whose reports go to another area (XXX)
 
 =cut
 
-sub remove_redundant_councils {
+sub remove_redundant_areas {
   my $self = shift;
-  my $all_councils = shift;
+  my $all_areas = shift;
 }
 
 =item filter_all_council_ids_list
diff --git a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
index 6bec115dd..13dded839 100644
--- a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
+++ b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
@@ -100,13 +100,13 @@ sub guess_road_operator {
     return '';
 }
 
-sub remove_redundant_councils {
+sub remove_redundant_areas {
     my $self = shift;
-    my $all_councils = shift;
+    my $all_areas = shift;
 
     # Oslo is both a kommune and a fylke, we only want to show it once
-    delete $all_councils->{301}     #
-        if $all_councils->{3};
+    delete $all_areas->{301}
+        if $all_areas->{3};
 }
 
 sub filter_all_council_ids_list {
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index d5456d056..e68d13715 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -100,19 +100,19 @@ sub geocode_postcode {
     return {};
 }
 
-sub remove_redundant_councils {
+sub remove_redundant_areas {
   my $self = shift;
-  my $all_councils = shift;
+  my $all_areas = shift;
 
   # Ipswich & St Edmundsbury are responsible for everything in their
   # areas, not Suffolk
-  delete $all_councils->{2241}
-    if $all_councils->{2446}    #
-        || $all_councils->{2443};
+  delete $all_areas->{2241}
+    if $all_areas->{2446}    #
+        || $all_areas->{2443};
 
   # Norwich is responsible for everything in its areas, not Norfolk
-  delete $all_councils->{2233}    #
-    if $all_councils->{2391};
+  delete $all_areas->{2233}    #
+    if $all_areas->{2391};
 }
 
 sub filter_all_council_ids_list {
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index a9ebb1b3f..c7eaf8da0 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -51,7 +51,7 @@ sub enter_postcode_text {
     return 'Enter a ' . $self->council_area . ' postcode, or street name and area';
 }
 
-sub council_check {
+sub area_check {
     my ( $self, $params, $context ) = @_;
 
     my $councils = $params->{all_councils};