[Po4a-commits] "po4a/lib/Locale/Po4a Xml.pm,1.64,1.65"

[Nicolas FRANCOIS]

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

Modified Files:
	Xml.pm 
Log Message:
Handle the 'untranslated' tags at the end. The tags from teh untranslated
list can override any of the other lists (translated, tags, inline).


Index: Xml.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Xml.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- Xml.pm	2 Mar 2008 00:26:04 -0000	1.64
+++ Xml.pm	2 Mar 2008 00:39:18 -0000	1.65
@@ -1098,12 +1098,6 @@
 # TODO: a less precise set of tags should not override a more precise one
 	# The tags and tagsonly options are deprecated.
 	# The translated and untranslated options have an higher priority.
-	$tag = $self->get_tag_from_list($path, @{$self->{untranslated}});
-	if (defined $tag) {
-		$usedefault = 0;
-		$options = "";
-		$translate = 0;
-	}
 	$tag = $self->get_tag_from_list($path, @{$self->{translated}});
 	if (defined $tag) {
 		$usedefault = 0;
@@ -1116,6 +1110,13 @@
 		$options .= ($self->{options}{'wrap'})?"w":"W";
 	}
 
+	$tag = $self->get_tag_from_list($path, @{$self->{untranslated}});
+	if (defined $tag) {
+		$usedefault = 0;
+		$options = "";
+		$translate = 0;
+	}
+
 	if ($usedefault) {
 		$options = $self->{options}{'defaulttranslateoption'};
 	}