diff options
| -rw-r--r-- | perllib/Page.pm | 2 | ||||
| -rw-r--r-- | perllib/Problems.pm | 2 | ||||
| -rwxr-xr-x | web-admin/index.cgi | 6 | ||||
| -rwxr-xr-x | web/alert.cgi | 18 | ||||
| -rwxr-xr-x | web/index.cgi | 8 | ||||
| -rwxr-xr-x | web/rss.cgi | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm index 4e4e74169..8135d1306 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -562,7 +562,7 @@ sub display_problem_meta_line($$) { $problem->{council} =~ s/\|.*//g; my @councils = split /,/, $problem->{council}; my $areas_info = mySociety::MaPit::call('areas', \@councils); - my $council = join(' and ', map { encode_utf8($areas_info->{$_}->{name}) } @councils); + my $council = join(' and ', map { $areas_info->{$_}->{name} } @councils); $out .= '<small class="council_sent_info">'; $out .= $q->br() . sprintf(_('Sent to %s %s later'), $council, prettify_duration($problem->{whensent}, 'minute')); $out .= '</small>'; diff --git a/perllib/Problems.pm b/perllib/Problems.pm index 7b37fe7d7..127d88a30 100644 --- a/perllib/Problems.pm +++ b/perllib/Problems.pm @@ -262,7 +262,7 @@ sub problems_matching_criteria { my $areas_info = mySociety::MaPit::call('areas', \@councils); foreach my $problem (@$problems){ if ($problem->{council}) { - my @council_names = map { encode_utf8($areas_info->{$_}->{name}) } @{$problem->{council}} ; + my @council_names = map { $areas_info->{$_}->{name} } @{$problem->{council}} ; $problem->{council} = join(' and ', @council_names); } } diff --git a/web-admin/index.cgi b/web-admin/index.cgi index abcf58a8c..8bb489605 100755 --- a/web-admin/index.cgi +++ b/web-admin/index.cgi @@ -216,7 +216,7 @@ sub admin_councils_list ($) { if $areas->{$_}->{parent_area}; push @li, $q->li($q->a({ href => NewURL($q, area_id => $_, page => 'councilcontacts') }, - encode_utf8($areas->{$_}->{name})) . encode_utf8($parent) . ' ' . + $areas->{$_}->{name}) . $parent . ' ' . ($bci_info->{$_} && $q->{site} ne 'emptyhomes' ? $bci_info->{$_}->{c} . ' addresses' : '')); @@ -310,7 +310,7 @@ sub admin_council_contacts ($$) { # Title my $mapit_data = mySociety::MaPit::call('area', $area_id); - my $title = sprintf(_('Council contacts for %s'), encode_utf8($mapit_data->{name})); + my $title = sprintf(_('Council contacts for %s'), $mapit_data->{name}); print html_head($q, $title); print $q->h1($title); print $updated; @@ -393,7 +393,7 @@ sub admin_council_edit ($$$) { my $mapit_data = mySociety::MaPit::call('area', $area_id); # Title - my $title = sprintf(_('Council contacts for %s'), encode_utf8($mapit_data->{name})); + my $title = sprintf(_('Council contacts for %s'), $mapit_data->{name}); print html_head($q, $title); print $q->h1($title); diff --git a/web/alert.cgi b/web/alert.cgi index fba7ef5d7..e2a4efaac 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -131,8 +131,8 @@ sub alert_list { $fylke = $_; } } - my $kommune_name = encode_utf8($kommune->{name}); - my $fylke_name = encode_utf8($fylke->{name}); + my $kommune_name = $kommune->{name}; + my $fylke_name = $fylke->{name}; if ($fylke->{id} == 3) { # Oslo @@ -177,8 +177,8 @@ for the county council.'))) . '</div><div id="rss_buttons">'; $ward = $_; } } - my $council_name = encode_utf8($council->{name}); - my $ward_name = encode_utf8($ward->{name}); + my $council_name = $council->{name}; + my $ward_name = $ward->{name}; push @options, [ 'council', $council->{id}, Page::short_name($council), sprintf(_("Problems within %s"), $council_name) ]; push @options, [ 'ward', $council->{id}.':'.$ward->{id}, Page::short_name($council) . '/' @@ -195,7 +195,7 @@ for the county council.'))) . '</div><div id="rss_buttons">'; foreach (values %$areas) { $council = $_; } - my $council_name = encode_utf8($council->{name}); + my $council_name = $council->{name}; push @options, [ 'council', $council->{id}, Page::short_name($council), sprintf(_("Problems within %s"), $council_name) ]; @@ -218,10 +218,10 @@ for the county council.'))) . '</div><div id="rss_buttons">'; $d_ward = $_; } } - my $district_name = encode_utf8($district->{name}); - my $d_ward_name = encode_utf8($d_ward->{name}); - my $county_name = encode_utf8($county->{name}); - my $c_ward_name = encode_utf8($c_ward->{name}); + my $district_name = $district->{name}; + my $d_ward_name = $d_ward->{name}; + my $county_name = $county->{name}; + my $c_ward_name = $c_ward->{name}; push @options, [ 'area', $district->{id}, Page::short_name($district), $district_name ], [ 'area', $district->{id}.':'.$d_ward->{id}, Page::short_name($district) . '/' diff --git a/web/index.cgi b/web/index.cgi index aa1ba31bb..12808fb02 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -638,7 +638,7 @@ If this is not the correct location, simply click on the map again. ')); $vars{page_heading} = $q->h1(_('Reporting a problem')); if ($details eq 'all') { - my $council_list = join('</strong> or <strong>', map { encode_utf8($_->{name}) } values %$all_councils); + my $council_list = join('</strong> or <strong>', map { $_->{name} } values %$all_councils); if ($q->{site} eq 'emptyhomes'){ $vars{text_help} = '<p>' . sprintf(_('All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your @@ -657,9 +657,9 @@ name if you give us permission.'), $council_list); push @missing, $_ unless $councils{$_}; } my $n = @missing; - my $list = join(_(' or '), map { encode_utf8($all_councils->{$_}->{name}) } @missing); + my $list = join(_(' or '), map { $all_councils->{$_}->{name} } @missing); $vars{text_help} = '<p>' . _('All the information you provide here will be sent to') . '<strong>' - . join('</strong>' . _(' or ') . '<strong>', map { encode_utf8($all_councils->{$_}->{name}) } @councils) + . join('</strong>' . _(' or ') . '<strong>', map { $all_councils->{$_}->{name} } @councils) . '</strong>. '; $vars{text_help} .= _('The subject and details of the problem will be public, plus your name if you give us permission.'); $vars{text_help} .= mySociety::Locale::nget( @@ -672,7 +672,7 @@ name if you give us permission.'), $council_list); . '|' . join(',', @missing) . '">'; } else { my $e = Cobrand::contact_email($cobrand); - my $list = join(' or ', map { encode_utf8($_->{name}) } values %$all_councils); + my $list = join(' or ', map { $_->{name} } values %$all_councils); my $n = scalar keys %$all_councils; if ($q->{site} ne 'emptyhomes') { $vars{text_help} = '<p>'; diff --git a/web/rss.cgi b/web/rss.cgi index 2d6f3a037..1ca2a1fe2 100755 --- a/web/rss.cgi +++ b/web/rss.cgi @@ -47,7 +47,7 @@ sub main { my $id = $q->param('id'); my $va_info = mySociety::MaPit::call('area', $id); my $qs = '/'.$id; - $out = FixMyStreet::Alert::generate_rss($type, $xsl, $qs, [$id], { NAME => encode_utf8($va_info->{name}) }, $cobrand, $q); + $out = FixMyStreet::Alert::generate_rss($type, $xsl, $qs, [$id], { NAME => $va_info->{name} }, $cobrand, $q); } elsif ($type eq 'all_problems') { $out = FixMyStreet::Alert::generate_rss($type, $xsl, '', undef, undef, $cobrand, $q); } else { @@ -120,7 +120,7 @@ sub rss_local_problems { $pretty_pc_escaped =~ s/%20/+/g; $qs = "?pc=$pretty_pc_escaped"; - $title_params{'POSTCODE'} = encode_utf8($pretty_pc); + $title_params{'POSTCODE'} = $pretty_pc; } # pass through rather than redirecting. } elsif ( $lat || $lon ) { |