diff options
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 2 | ||||
-rw-r--r-- | perllib/Utils.pm | 34 |
2 files changed, 14 insertions, 22 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 7ee28ef8f..6d22a0556 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -549,7 +549,7 @@ sub setup_categories_and_councils : Private { $area_ids_to_list{ $first_council->{id} } = 1; my @local_categories; if ($first_council->{id} == COUNCIL_ID_BARNET) { - @local_categories = (sort(keys %{ Utils::barnet_categories() }), _('Other') ) + @local_categories = sort(keys %{ Utils::barnet_categories() }); # removed 'Other' option } else { @local_categories = sort keys %{ Utils::london_categories() } } diff --git a/perllib/Utils.pm b/perllib/Utils.pm index 3c8978881..57c2addf1 100644 --- a/perllib/Utils.pm +++ b/perllib/Utils.pm @@ -143,27 +143,19 @@ sub london_categories { sub barnet_categories { # The values here are KBIDs from Barnet's system: see bin/send-reports for formatting # category KBID Barnet's title for this KBID - return { - 'Abandoned vehicle' => 0, - 'Blocked gully/drain' => 255, # Gullies-Blocked - 'Bus stop' => 0, - 'Dead animal' => 286, # Animals-Dead-Removal - 'Dog fouling' => 288, # Dog Fouling-Clear - 'Flyposting' => 0, - 'Flytipping' => 347, # Fly tipping-Clear - 'Graffiti' => 292, # Graffiti-Removal - 'Park/landscape' => 0, - 'Pavement/footpath' => 195, # Pavements-Damaged/Cracked - 'Pothole' => 204, # Pothole - 'Public toilet' => 0, - 'Road sign' => 432, # Roads Signs - Maintenance - 'Roads/highways' => 190, # Complaint-Highways Maintenance - 'Rubbish/litter' => 349, # Accumulated Litter - 'Street cleaning' => 0, - 'Street lighting' => 251, # Street Lighting - 'Street nameplate' => 0, - 'Traffic lights' => 103, # Traffic lights - 'Tree' => 162, # Tree section + return { + 'Blocked drain' => 255, # Gullies-Blocked + 'Dead animal' => 286, # Animals-Dead-Removal + 'Dog fouling' => 288, # Dog Fouling-Clear + 'Fly tipping' => 347, # Fly tipping-Clear + 'Graffiti' => 292, # Graffiti-Removal + 'Litter, accumulated' => 349, # Accumulated Litter + 'Litter, overflowing bins' => 205, # Litter Bins-Overflowing + 'Pavements' => 195, # Pavements-Damaged/Cracked + 'Pothole' => 204, # Pothole + 'Roads Signs' => 432, # Roads Signs - Maintenance + 'Street Lighting' => 251, # Street Lighting + 'Traffic Lights' => 103, # Traffic Lights }; } |