[Po4a-commits] "po4a NEWS, 1.117, 1.118 changelog, 1.533, 1.534 po4a, 1.88, 1.89 po4a-updatepo, 1.46, 1.47"

[Nicolas FRANÇOIS]

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

Modified Files:
	NEWS changelog po4a po4a-updatepo 
Log Message:
	* NEWS, po4a, po4a-updatepo: --previous is activated by default.
	* NEWS, po4a, po4a-updatepo: Use --no-previous to support versions
	of gettext earlier than 0.16.
	* lib/Locale/Po4a/Po.pm: Add a lang attribute, based on the PO
	file basename.
	* NEWS, lib/Locale/Po4a/Xml.pm: Add option addlang to force po4a
	to add a lang attribute to some tags.


Index: NEWS
===================================================================
RCS file: /cvsroot/po4a/po4a/NEWS,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- NEWS	27 Dec 2009 03:43:52 -0000	1.117
+++ NEWS	30 Dec 2009 21:12:31 -0000	1.118
@@ -4,8 +4,13 @@
 
 * Major changes in release 0.37.2 (2009-12-27)
 
+po4a, po4a-updatepo:
+ * --previous is activated by default.
+ * Use --no-previous to support versions of gettext earlier than 0.16.
+
 Xml:
  * Fix handling of multi-lines placeholder tags.
+ * New option addlang.
 
 Pod:
  * Detect the encoding based on the input's =encoding line.

Index: po4a-updatepo
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a-updatepo,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- po4a-updatepo	27 Dec 2009 01:16:01 -0000	1.46
+++ po4a-updatepo	30 Dec 2009 21:12:31 -0000	1.47
@@ -70,10 +70,15 @@
 Specify each option in the 'name=value' format. See the documentation of
 each plugin for more information about the valid options and their meanings.
 
+=item --no-previous
+
+This option removes '--previous' from the options passed to msgmerge.
+This permits to support versions of gettext earlier than 0.16.
+
 =item --previous
 
 This option adds '--previous' to the options passed to msgmerge.
-It requires gettext 0.16 or later.
+It requires gettext 0.16 or later, and is activated by default.
 
 =item --msgmerge-opt options
 
@@ -169,6 +174,7 @@
 my ($copyright_holder, $msgid_bugs_address, $package_name, $package_version);
 my $mastchar;
 my $previous;
+my $noprevious;
 my $msgmerge_opt = "";
 GetOptions('help|h'      => \$help,
 	   'help-format' => \$help_fmt,
@@ -181,6 +187,7 @@
 
 	   'option|o=s'  => \@options,
 
+	   'no-previous' => \$noprevious,
 	   'previous'    => \$previous,
 	   'msgmerge-opt=s'      => \$msgmerge_opt,
 	   'copyright-holder=s'  => \$copyright_holder,
@@ -197,7 +204,7 @@
 $help_fmt && Locale::Po4a::Chooser::list(0);
 pod2usage () if scalar @masterfiles < 1 || scalar @pofiles < 1;
 
-$msgmerge_opt .= " --previous" if $previous;
+$msgmerge_opt .= " --no-previous" if $noprevious;
 
 my %options = (
     "verbose"            => $verbose,

Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- po4a	27 Dec 2009 01:16:01 -0000	1.88
+++ po4a	30 Dec 2009 21:12:31 -0000	1.89
@@ -337,10 +337,15 @@
 
 Extra options for msgmerge.
 
+=item --no-previous
+
+This option removes '--previous' from the options passed to msgmerge.
+This permits to support versions of gettext earlier than 0.16.
+
 =item --previous
 
 This option adds '--previous' to the options passed to msgmerge.
-It requires gettext 0.16 or later.
+It requires gettext 0.16 or later, and is activated by default.
 
 =item --srcdir I<SRCDIR>
 
@@ -430,6 +435,7 @@
     my @options = ();
     my @variables = ();
     my $previous;
+    my $noprevious;
 
     my %opts = (
         "help"            => 0,
@@ -481,6 +487,7 @@
         'msgid-bugs-address=s'  => \$opts{"msgid-bugs-address"},
         'package-name=s'        => \$opts{"package-name"},
         'package-version=s'     => \$opts{"package-version"},
+        'no-previous'           => \$noprevious,
         'previous'              => \$previous,
         'msgmerge-opt=s'        => \$opts{"msgmerge-opt"},
         'srcdir=s'              => \$opts{"srcdir"},
@@ -490,7 +497,7 @@
     $opts{"verbose"} = scalar @verbose;
     $opts{"verbose"} = 0 if $opts{"quiet"};
     $opts{"verbose"} ||= 1 if $opts{"debug"};
-    $opts{"msgmerge-opt"} .= " --previous" if $previous;
+    $opts{"msgmerge-opt"} .= " --previous" unless $noprevious;
 
     # options to transmit to the modules
     $opts{"options"} = {

Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/changelog,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -d -r1.533 -r1.534
--- changelog	30 Dec 2009 20:41:13 -0000	1.533
+++ changelog	30 Dec 2009 21:12:31 -0000	1.534
@@ -1,5 +1,18 @@
 2009-12-30  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* NEWS, po4a, po4a-updatepo: --previous is activated by default.
+	* NEWS, po4a, po4a-updatepo: Use --no-previous to support versions
+	of gettext earlier than 0.16.
+
+2009-12-30  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* lib/Locale/Po4a/Po.pm: Add a lang attribute, based on the PO
+	file basename.
+	* NEWS, lib/Locale/Po4a/Xml.pm: Add option addlang to force po4a
+	to add a lang attribute to some tags.
+
+2009-12-30  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* share/doc/po4a-build.xml, share/doc/po4aman-display-po.xml,
 	share/doc/po4apod-display-po.xml: Use more content related tags.
 	* po/pod/ca.po, po/pod/es.po, po/pod/fr.po, po/pod/it.po,