[Debian-l10n-commits] r2823 - in /dl10n/trunk/lib/Debian/L10n: BTS.pm Mail.pm Utils.pm

[taffit at users.alioth.debian.org]

Author: taffit
Date: Fri Dec 23 14:24:20 2011
New Revision: 2823

URL: http://svn.debian.org/wsvn/?sc=1&rev=2823
Log:
Fix charset on robot webpages, closes: #587122

Modified:
    dl10n/trunk/lib/Debian/L10n/BTS.pm
    dl10n/trunk/lib/Debian/L10n/Mail.pm
    dl10n/trunk/lib/Debian/L10n/Utils.pm

Modified: dl10n/trunk/lib/Debian/L10n/BTS.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/L10n/BTS.pm?rev=2823&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/L10n/BTS.pm (original)
+++ dl10n/trunk/lib/Debian/L10n/BTS.pm Fri Dec 23 14:24:20 2011
@@ -13,7 +13,7 @@
 use Date::Parse;
 use Date::Format;
 use Encode qw(decode_utf8);
-use HTML::Entities; # encode_entities
+use HTML::Entities qw(encode_entities_numeric);
 
 use Data::Dumper;
 
@@ -51,7 +51,7 @@
 	$submitter = Debian::L10n::Utils::parse_from($submitter);
 
 	$submitter = decode_base64($submitter) if $submitter =~ /^: /;
-	$submitter = encode_entities(decode_utf8($submitter));
+	$submitter = encode_entities_numeric(decode_utf8($submitter));
 	$submitter =~ s/</</;
 	$submitter =~ s/>/>/;
 

Modified: dl10n/trunk/lib/Debian/L10n/Mail.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/L10n/Mail.pm?rev=2823&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/L10n/Mail.pm (original)
+++ dl10n/trunk/lib/Debian/L10n/Mail.pm Fri Dec 23 14:24:20 2011
@@ -99,6 +99,10 @@
 		my $translator;
 		my $sender = $m->sender;
 		if (defined $sender) {
+# May need to take care of the following that has been ejected from Debian/L10n/Utils.pm
+#	unless ($_ =~ m/=?unknown-8bit?b?/) {
+#		Encode::from_to($_, 'MIME-Header', 'utf8');
+#	} 
 			$translator = Debian::L10n::Utils::parse_from($sender->format());
 		} else {
 			$translator = "UNDEF";

Modified: dl10n/trunk/lib/Debian/L10n/Utils.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/L10n/Utils.pm?rev=2823&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/L10n/Utils.pm (original)
+++ dl10n/trunk/lib/Debian/L10n/Utils.pm Fri Dec 23 14:24:20 2011
@@ -168,11 +168,12 @@
 
 	return "UNDEF" if not defined $_;
 
-	# http://lists.debian.org/debian-l10n-english/2009/07/msg00039.html
-	# Do not recode with a broken encoding
-	unless ($_ =~ m/=?unknown-8bit?b?/) {
-		Encode::from_to($_, 'MIME-Header', 'utf8');
-	}
+#	No need to recode anything at this point, at least for the BTS
+#	# http://lists.debian.org/debian-l10n-english/2009/07/msg00039.html
+#	# Do not recode with a broken encoding
+#	unless ($_ =~ m/=?unknown-8bit?b?/) {
+#		Encode::from_to($_, 'MIME-Header', 'utf8');
+#	}
 
 	s/^From: //;
 	s/"//g;