[Po4a-commits] "po4a/lib/Locale/Po4a Po.pm, 1.102, 1.103 TransTractor.pm, 1.124, 1.125"

[Denis Barbier]

Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory alioth:/tmp/cvs-serv4341/lib/Locale/Po4a

Modified Files:
	Po.pm TransTractor.pm 
Log Message:
Official charset name is UTF-8, not utf-8

Fix generation of POT files
Regenerate po/pod/po4a-pod.pot and po/www/po4a-www.pot


Index: Po.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Po.pm,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- Po.pm	27 Jul 2010 22:15:06 -0000	1.102
+++ Po.pm	30 Jul 2010 16:59:17 -0000	1.103
@@ -597,7 +597,7 @@
 
     if ( $poorig->get_charset =~ /^utf-8$/i ) {
         $potrans->to_utf8;
-        $pores->set_charset("utf-8");
+        $pores->set_charset("UTF-8");
     } else {
         if ($potrans->get_charset eq "CHARSET") {
             $pores->set_charset("ascii");
@@ -939,7 +939,7 @@
         foreach my $msgid ( keys %{$this->{po}} ) {
             Encode::from_to($this->{po}{$msgid}{'msgstr'}, $charset, "utf-8");
         }
-        $this->set_charset("utf-8");
+        $this->set_charset("UTF-8");
     }
 }
 

Index: TransTractor.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/TransTractor.pm,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- TransTractor.pm	28 Jul 2010 23:57:32 -0000	1.124
+++ TransTractor.pm	30 Jul 2010 16:59:18 -0000	1.125
@@ -887,7 +887,7 @@
 	# We set the output po charset 
         if ($out_charset eq "CHARSET") {
 	    if ($self->{TT}{utf_mode}) {
-		$out_charset="utf-8";
+		$out_charset="UTF-8";
 	    } else {
 		$out_charset=$in_charset;
 	    }
@@ -1006,7 +1006,7 @@
 	$charset=$self->{TT}{'file_out_charset'};
     } else {
 	if ($self->{TT}{utf_mode} && $self->{TT}{ascii_input}) {
-	    $charset="utf-8";
+	    $charset="UTF-8";
 	} else {
 	    $charset=$self->{TT}{po_in}->get_charset;
 	    $charset=$self->{TT}{'file_in_charset'}