[Po4a-commits] "po4a changelog,1.539,1.540 po4a,1.90,1.91"

[Denis Barbier]

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

Modified Files:
	changelog po4a 
Log Message:
po4a: Expand $lang in --msgmerge-opt option


Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- po4a	13 Jan 2010 23:51:13 -0000	1.90
+++ po4a	14 Jan 2010 21:40:13 -0000	1.91
@@ -1069,8 +1069,9 @@
     if (-e $po_filename{$lang}) {
 	print wrap_msg(gettext("Updating %s:")." ", $po_filename{$lang})
 	    if ($po4a_opts{"verbose"});
-	my $cmd = "msgmerge -U ".$po_filename{$lang}." $pot_filename ".
-	          $po4a_opts{"msgmerge-opt"}.
+	my $msgmerge_opt = $po4a_opts{"msgmerge-opt"};
+	$msgmerge_opt =~ s/\$lang\b/$lang/g if scalar @langs;
+	my $cmd = "msgmerge -U ".$po_filename{$lang}." $pot_filename ".$msgmerge_opt.
 	          (($po4a_opts{"no-backups"}||$po4a_opts{"split"})?
 	           " --backup=none":"");
 	run_cmd($cmd);

Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/changelog,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -d -r1.539 -r1.540
--- changelog	13 Jan 2010 23:51:13 -0000	1.539
+++ changelog	14 Jan 2010 21:40:12 -0000	1.540
@@ -1,3 +1,7 @@
+2010-01-14  Denis Barbier <barbier-guest at alioth.debian.org>
+
+	* po4a: Expand $lang in --msgmerge-opt option.
+
 2010-01-14  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* po4a: Check earlier if master files exist.