[Po4a-commits] "po4a NEWS, 1.50, 1.51 changelog, 1.335, 1.336 Build.PL, 1.34, 1.35 html-build-upload.sh, 1.17, 1.18"

Tue Mar 18 20:32:33 UTC 2008

Update of /cvsroot/po4a/po4a
In directory alioth:/tmp/cvs-serv7669

Modified Files:
	NEWS changelog Build.PL html-build-upload.sh 
Log Message:
* NEWS, Build.PL, html-build-upload.sh, po/pod.cfg: Generate the
  manpages in UTF-8.
* doc/addendum.ca, doc/addendum.pl, doc/addendum_man.fr,
  doc/addendum_man.pl: Convert to UTF-8.


Index: NEWS
===================================================================
RCS file: /cvsroot/po4a/po4a/NEWS,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51

--- NEWS	18 Mar 2008 18:47:48 -0000	1.50
+++ NEWS	18 Mar 2008 20:32:29 -0000	1.51
@@ -5,6 +5,7 @@
 
 translations:
  * New Japanese translation.
+ * The manpages are generated in UTF-8.
 
 ===============================================================================
 * Major changes in release 0.33.1 (2008-03-16)

Index: html-build-upload.sh
===================================================================
RCS file: /cvsroot/po4a/po4a/html-build-upload.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- html-build-upload.sh	18 Mar 2008 19:05:46 -0000	1.17
+++ html-build-upload.sh	18 Mar 2008 20:32:29 -0000	1.18
@@ -20,23 +20,6 @@
 	echo $((($YES*100)/$TOTAL))
 }
 
-get_charset() {
-	case $1 in
-		en)
-			echo "UTF-8"
-			;;
-		pl)
-			echo "ISO-8859-2"
-			;;
-		ja)
-			echo "UTF-8"
-			;;
-		*)
-			echo "ISO-8859-1"
-			;;
-	esac
-}
-
 POFILES=`cd po/pod; ls *.po`
 LANGS=${POFILES//.po/}
 
@@ -130,7 +113,6 @@
 			page=$(ls html.gen/en/$man*)
 		fi
 		title=$(lexgrog "$page" |
-		        iconv -f $(get_charset $lang) -t utf8 | \
 		        sed -ne 's/.*: \".* - //;s/"$//;p')
 		ref=$man.php
 		man=$(basename $man)
@@ -165,8 +147,8 @@
 		                       -e 's/\.html"/\.php"/g' \
 		                       -e "s/<HEAD>/<HEAD><link rel=\"stylesheet\" title=\"Default Style\" type=\"text\/css\" href=\"..\/..\/default.css\"><meta content=\"text\/html; charset=UTF-8\" http-equiv=\"Content-Type\">/" \
 		                       -e "s/<BODY>/<BODY><? include \"..\/..\/header2.php.${lang/pl/po}\"; ?><div id=\"content\">/" \
-		                       -e "s/<\/BODY>/<\/div><? include \"$footer\"; ?><? include \"..\/..\/footer.php\"; ?><\/BODY>/" | \
-		                   iconv -f $(get_charset $lang) -t utf8 > $out
+		                       -e "s/<\/BODY>/<\/div><? include \"$footer\"; ?><? include \"..\/..\/footer.php\"; ?><\/BODY>/" > $out
+ls -l $out
 	done
 
 	if [ "$lang" != "en" ]

Index: Build.PL
===================================================================
RCS file: /cvsroot/po4a/po4a/Build.PL,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Build.PL	18 Mar 2008 19:03:26 -0000	1.34
+++ Build.PL	18 Mar 2008 20:32:29 -0000	1.35
@@ -36,7 +36,7 @@
 	    unless ($self->up_to_date(\@files, "po/bin/po4a.pot")) {
 		print "XX Update po/bin/po4a.pot\n";
 		my $podfiles = join ("", map {" ../../".$_ } @files);
-		system("cd po/bin; xgettext --from-code=iso-8859-1 -L Perl $podfiles -o po4a.pot.new") && die;
+		system("cd po/bin; xgettext --from-code=utf-8 -L Perl $podfiles -o po4a.pot.new") && die;
 		if ( -e "po/bin/po4a.pot") {
 		    $diff = qx(diff -q -I'#:' -I'POT-Creation-Date:' -I'PO-Revision-Date:' po/bin/po4a.pot po/bin/po4a.pot.new);
 		    if ( $diff eq "" ) {
@@ -120,6 +120,7 @@
 
 		my $command;
 		$command = "msggrep -K -E -e \"Po4a Tools\" po/pod/$lang.po |";
+		$command .= "msgconv -t UTF-8 | ";
 		$command .= "msgexec /bin/sh -c '[ -n \"\$MSGEXEC_MSGID\" ] ";
 		$command .= "&& cat || cat > /dev/null'";
 

Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/changelog,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -d -r1.335 -r1.336
--- changelog	18 Mar 2008 19:05:46 -0000	1.335
+++ changelog	18 Mar 2008 20:32:29 -0000	1.336
@@ -1,5 +1,12 @@
 2008-03-18  Nicolas FranÃ§ois  <nicolas.francois at centraliens.net>
 
+	* NEWS, Build.PL, html-build-upload.sh, po/pod.cfg: Generate the
+	manpages in UTF-8.
+	* doc/addendum.ca, doc/addendum.pl, doc/addendum_man.fr,
+	doc/addendum_man.pl: Convert to UTF-8.
+
+2008-03-18  Nicolas FranÃ§ois  <nicolas.francois at centraliens.net>
+
 	* html-build-upload.sh: Added support for the Japanese web pages.
 	* html-build-upload.sh: Call po4a with the --previous option.
 


