[Po4a-commits] "po4a changelog,1.540,1.541 po4a,1.91,1.92"

[Nicolas FRANÇOIS]

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

Modified Files:
	changelog po4a 
Log Message:
	* po4a: Document the $lang expansion in --msgmerge-opt
	* po4a: Improve the $lang expansion outside of --msgmerge-opt
	(e.g. to avoid expansion of $language)


Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- po4a	14 Jan 2010 21:40:13 -0000	1.91
+++ po4a	14 Jan 2010 22:02:08 -0000	1.92
@@ -337,6 +337,8 @@
 
 Extra options for msgmerge.
 
+Note: $lang will be extended to the current language.
+
 =item --no-previous
 
 This option removes '--previous' from the options passed to msgmerge.
@@ -656,11 +658,11 @@
 	# Expand the $lang templates
 	my($args2) = "";
 	foreach my $arg (split(/ /,$args)) {
-	    if ( $arg =~ /\$lang/ ) {
+	    if ( $arg =~ /\$lang\b/ ) {
 		# Expand for all the langs
 		foreach my $lang (@langs) {
 		    my($arg2) = $arg;
-		    $arg2 =~ s/\$lang/$lang/g;
+		    $arg2 =~ s/\$lang\b/$lang/g;
 		    $args2 .= $arg2." ";
 		}
 	    } else {

Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/changelog,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -d -r1.540 -r1.541
--- changelog	14 Jan 2010 21:40:12 -0000	1.540
+++ changelog	14 Jan 2010 22:02:03 -0000	1.541
@@ -1,3 +1,9 @@
+2010-01-14  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* po4a: Document the $lang expansion in --msgmerge-opt
+	* po4a: Improve the $lang expansion outside of --msgmerge-opt
+	(e.g. to avoid expansion of $language)
+
 2010-01-14  Denis Barbier <barbier-guest at alioth.debian.org>
 
 	* po4a: Expand $lang in --msgmerge-opt option.