diff options
Diffstat (limited to 'web')
| -rwxr-xr-x | web/alert.cgi | 18 | ||||
| -rwxr-xr-x | web/index.cgi | 8 | ||||
| -rwxr-xr-x | web/rss.cgi | 4 |
3 files changed, 15 insertions, 15 deletions
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 ) { |