aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2011-06-07 17:50:31 +0100
committerMatthew Somerville <matthew@mysociety.org>2011-06-07 17:50:31 +0100
commitf128b19cf7bf0da5dd445dc39d1a09e8953fc32d (patch)
treebfe7d772ece4a5725ae8389c43452c0aa0e3bb44 /perllib/FixMyStreet/Cobrand/FiksGataMi.pm
parentb5a218792a7bcf477c930205b6a7c341a90d3efd (diff)
Creation of new Southampton cobrand, removal of old cobrands.
Diffstat (limited to 'perllib/FixMyStreet/Cobrand/FiksGataMi.pm')
-rw-r--r--perllib/FixMyStreet/Cobrand/FiksGataMi.pm41
1 files changed, 20 insertions, 21 deletions
diff --git a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
index a5b71e46b..4dd2ef49a 100644
--- a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
+++ b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
@@ -62,37 +62,36 @@ sub geocoded_string_check {
}
sub remove_redundant_councils {
- my $self = shift;
- my $all_councils = shift;
+ my $self = shift;
+ my $all_councils = shift;
- # Oslo is both a kommune and a fylke, we only want to show it once
- delete $all_councils->{301} #
- if $all_councils->{3};
+ # Oslo is both a kommune and a fylke, we only want to show it once
+ delete $all_councils->{301} #
+ if $all_councils->{3};
}
sub filter_all_council_ids_list {
- my $self = shift;
- my @all_councils_ids = @_;
+ my $self = shift;
+ my @all_councils_ids = @_;
- # as above we only want to show Oslo once
- return grep { $_ != 301 } @all_councils_ids;
+ # as above we only want to show Oslo once
+ return grep { $_ != 301 } @all_councils_ids;
}
sub short_name {
- my $self = shift;
- my ($area, $info) = @_;
-
- if ($area->{name} =~ /^(Os|Nes|V\xe5ler|Sande|B\xf8|Her\xf8y)$/) {
- my $parent = $info->{$area->{parent_area}}->{name};
- return URI::Escape::uri_escape_utf8("$area->{name}, $parent");
- }
+ my $self = shift;
+ my ($area, $info) = @_;
- my $name = $area->{name};
- $name =~ s/ & / and /;
- $name = URI::Escape::uri_escape_utf8($name);
- $name =~ s/%20/+/g;
- return $name;
+ if ($area->{name} =~ /^(Os|Nes|V\xe5ler|Sande|B\xf8|Her\xf8y)$/) {
+ my $parent = $info->{$area->{parent_area}}->{name};
+ return URI::Escape::uri_escape_utf8("$area->{name}, $parent");
+ }
+ my $name = $area->{name};
+ $name =~ s/ & / and /;
+ $name = URI::Escape::uri_escape_utf8($name);
+ $name =~ s/%20/+/g;
+ return $name;
}
sub council_rss_alert_options {