[Po4a-devel]Version 0.17.2 out
by Martin Quinson
Here are the changes:
po4a (0.17.2-1) unstable; urgency=low
[Martin Quinson]
- [sgml] add refentry to verbatim so that no spaces are added.
- [sgml] do not indent neither add superious spaces around verbatim tags
Those two should Closes #262739 (in Debian).
- [sgml] Allow entities def. to contain '>'. Closes #262735 (in Debian)
- [documentation] Overhaul of po4a(7)
- [documentation] Various pod fixup
- TransTractor and Po mkdir the path to where they are asked to write
something if it does not exist. Closes #263297 (in Debian)
- [addendum] Allow extra space after the semi colon separating fields in
headers. Closes #263299 (in Debian, provided that I understood the repport)
- [sgml] Allow %entities; in prolog, even if they are the evil incarned on
earth. Damn it, it wasn't easy. Fixes Alioth's #300710.
- [sgml] Detect when the included files do not exist, and spit the right
error message
- [translation] keep po/bin/fr.po in sync with the code, despite my own
effort to fuzzy the strings (I mean improve them, of course)
[Jordi Vilalta]
- [documentation] Further pod and english fixup
- [translation] Complete the spanish translation of the documentation
- [translation] sync to en po/bin/es.po and po/bin/ca.po
-- Martin Quinson <martin.quinson(a)tuxfamily.org> Sat, 7 Aug 2004 16:18:53 -0700
(I edited out the changes not visible out of the cvs like msgsearch and the
upcoming encoding fixes. I don't want to give false hopes to users. This
edit is only on the change file published on alioth, not the real changelog
within the package).
Pierre or Denis, would you mind upload the debian package, please? I cannot
do so without my key :-/
Thanks for your patience. Now, you are free to break po4a to implement the
encoding or whatever you need ;)
Bye, Mt.
--
Le soir, on regarde la télévision, puisque s'aimer, c'est regarder dans la
même direction.
-- Les malpolis
19 years, 9 months
[Po4a-devel][CVS] po4a/lib/Locale/Po4a Chooser.pm,1.15,1.16
by Jordi Vilalta
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv31950
Modified Files:
Chooser.pm
Log Message:
Little documentation enhancements
Index: Chooser.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Chooser.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Chooser.pm 30 Jul 2004 00:17:41 -0000 1.15
+++ Chooser.pm 8 Aug 2004 23:08:27 -0000 1.16
@@ -28,7 +28,7 @@
die gettext("Need to provide a module name to the Chooser")."\n"
unless defined $module;
-
+
my $modname;
if ($module eq 'kernelhelp') {
$modname = 'KernelHelp';
@@ -72,7 +72,7 @@
Locale::Po4a::Chooser is a module to manage po4a modules. Before, all po4a
binaries used to know all po4a modules (pod, man, sgml, etc). This made the
add of a new module a boring, to make sure the documentation is syncronized
-in all modules, and that each of them can access the new module.
+in all modules, and that each one of them can access the new module.
Now, you just have to call the Locale::Po4a::Chooser::new() function,
passing the name of module as argument.
@@ -86,7 +86,7 @@
=item About po4a:
-L<po4a(7)>,
+L<po4a(7)|po4a.7>,
L<Locale::Po4a::TransTractor(3pm)>,
L<Locale::Po4a::Po(3pm)>
19 years, 9 months
[Po4a-devel][CVS] po4a/lib/Locale/Po4a Po.pm,1.23,1.24
by Jordi Vilalta
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv22320
Modified Files:
Po.pm
Log Message:
Little documentation enhancements
Index: Po.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Po.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Po.pm 8 Aug 2004 21:51:06 -0000 1.23
+++ Po.pm 8 Aug 2004 23:00:55 -0000 1.24
@@ -42,7 +42,7 @@
For a more complete description of message catalogs in the po format and
their use, please refer to the documentation of the gettext program.
-This module is part of the PO4A project, which objectif is to use po files
+This module is part of the PO4A project, which objective is to use po files
(designed at origin to ease the translation of program messages) to
translate everything, including documentation (man page, info manual),
package description, debconf templates, and everything which may benefit
@@ -134,10 +134,10 @@
$self->stats_clear();
}
-=item read()
+=item read($)
Reads a po file (which name is given as argument). Previously existing
-entries in self are not removed, the new one are added to the end of the
+entries in self are not removed, the new ones are added to the end of the
catalog.
=cut
@@ -207,7 +207,7 @@
}
}
-=item write()
+=item write($)
Writes the current catalog to the given file.
@@ -274,11 +274,11 @@
# }
}
-=item gettextize()
+=item gettextize($$)
-This function produce one translated message catalog from two catalogs, an
-original and a translation. This process is described in po4a(7), section
-I<Gettextization: how does it work?>.
+This function produces one translated message catalog from two catalogs, an
+original and a translation. This process is described in L<po4a(7)|po4a.7>,
+section I<Gettextization: how does it work?>.
=cut
@@ -286,9 +286,9 @@
my $this = shift;
my $class = ref($this) || $this;
my ($poorig,$potrans)=(shift,shift);
-
+
my $pores=Locale::Po4a::Po->new();
-
+
if ($poorig->count_entries() > $potrans->count_entries()) {
warn sprintf(dgettext("po4a",
"po4a gettextize: Original have more strings that the translation (%d>%d).\n".
@@ -368,13 +368,15 @@
return $pores;
}
-=item filter()
+=item filter($)
-This function extract a catalog from an existing one. Only the entries having a
-reference in the given file will be placed in the resulting catalog.
+This function extracts a catalog from an existing one. Only the entries having
+a reference in the given file will be placed in the resulting catalog.
+
+This function parses its argument, converts it to a perl function definition,
+eval this definition and filter the fields for which this function returns
+true.
-This function parses its argument, convert it to a perl function definition,
-eval this definition and filter the fields for which this function returns true.
I love perl sometimes ;)
=cut
@@ -597,14 +599,15 @@
=back
-=head1 Functions to use a message catalogs for translations
+=head1 Functions to use a message catalog for translations
=over 4
=item gettext($%)
Request the translation of the string given as argument in the current catalog.
-The function returns the empty string if the string was not found.
+The function returns the original (untranslated) string if the string was not
+found.
After the string to translate, you can pass an hash of extra
arguments. Here are the valid entries:
@@ -613,8 +616,8 @@
=item wrap
-boolean indicating wheather we can consider that whitespaces in string are
-not important. If yes, the function canonize the string before looking for
+boolean indicating whether we can consider that whitespaces in string are
+not important. If yes, the function canonizes the string before looking for
a translation, and wraps the result.
=item wrapcol
@@ -670,7 +673,7 @@
=item stats_get()
Returns stats about the hit ratio of gettext since the last time that
-stats_clear() were called. Please note that it's not the same
+stats_clear() was called. Please note that it's not the same
statistics than the one printed by msgfmt --statistic. Here, it's stats
about recent usage of the po file, while msgfmt reports the status of the
file. Example of use:
@@ -707,11 +710,11 @@
=back
-=head1 Functions to build a message catalogs
+=head1 Functions to build a message catalog
=over 4
-=item push()
+=item push(%)
Push a new entry at the end of the current catalog. The arguments should
form an hash table. The valid keys are :
@@ -738,7 +741,7 @@
=item automatic
-a comment which where automatically added by the string extraction
+a comment which was automatically added by the string extraction
program. See the I<--add-comments> option of the B<xgettext> program for
more information.
@@ -760,20 +763,20 @@
other's msgid as msgstr. To make sure that things get ok, each msgid in po
objects are given a type, based on their structure (like "chapt", "sect1",
"p" and so on in docbook). If the types of strings are not the same, that
-mean that both files do not share the same structure, and the process
+means that both files do not share the same structure, and the process
reports an error.
This information is written as automatic comment in the po file since this
-to translators some context about the strings to translate.
+gives to translators some context about the strings to translate.
=item wrap
-boolean indicating wheather whitespaces can be mangeled in cosmetic
+boolean indicating whether whitespaces can be mangled in cosmetic
reformatings. If true, the string is canonized before use.
-This information written to the po file using the 'wrap' or 'no-wrap' flag.
+This information is written to the po file using the 'wrap' or 'no-wrap' flag.
-=item wrapcol
+=item wrapcol
The column at which we should wrap (default: 76).
@@ -938,10 +941,10 @@
return $1;
}
-=item set_charset()
+=item set_charset($)
This sets the character set of the po header to the value specified in its
-first argument. If you never call this function (and no file with an specified
+first argument. If you never call this function (and no file with a specified
character set is read), the default value is left to "CHARSET". This value
doesn't change the behavior of this module, it's just used to fill that field
in the header, and to return it in get_charset().
19 years, 9 months
[Po4a-devel][CVS] po4a/lib/Locale/Po4a Po.pm,1.22,1.23
by Jordi Vilalta
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv19624
Modified Files:
Po.pm
Log Message:
- Stop debugging encodings (this part is simple enough to work well)
- After gettextize() every po has a valid encoding (ascii instead of CHARSET)
- Remove bolds in doc to use the same style as in the rest of po4a
Index: Po.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Po.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Po.pm 8 Aug 2004 19:58:48 -0000 1.22
+++ Po.pm 8 Aug 2004 21:51:06 -0000 1.23
@@ -81,14 +81,14 @@
my %debug=('canonize' => 0,
'quote' => 0,
'escape' => 0,
- 'encoding' => 1,
+ 'encoding' => 0,
'filter' => 1);
=head1 Functions about whole message catalogs
=over 4
-=item B<new()>
+=item new()
Creates a new message catalog. If an argument is provided, it's the name of
a po file we should load.
@@ -134,7 +134,7 @@
$self->stats_clear();
}
-=item B<read()>
+=item read()
Reads a po file (which name is given as argument). Previously existing
entries in self are not removed, the new one are added to the end of the
@@ -207,7 +207,7 @@
}
}
-=item B<write()>
+=item write()
Writes the current catalog to the given file.
@@ -307,7 +307,11 @@
$potrans->to_utf;
$pores->set_charset("utf-8");
} else {
- $pores->set_charset($potrans->get_charset);
+ if ($potrans->get_text eq "CHARSET") {
+ $pores->set_charset("ascii");
+ } else {
+ $pores->set_charset($potrans->get_charset);
+ }
}
print "Po character sets:\n".
" original=".$poorig->get_charset."\n".
@@ -597,7 +601,7 @@
=over 4
-=item B<gettext($%)>
+=item gettext($%)
Request the translation of the string given as argument in the current catalog.
The function returns the empty string if the string was not found.
@@ -663,7 +667,7 @@
return $res;
}
-=item B<stats_get()>
+=item stats_get()
Returns stats about the hit ratio of gettext since the last time that
stats_clear() were called. Please note that it's not the same
@@ -689,7 +693,7 @@
return ( $p,$h,$q );
}
-=item B<stats_clear()>
+=item stats_clear()
Clears the stats about gettext hits.
@@ -707,7 +711,7 @@
=over 4
-=item B<push()>
+=item push()
Push a new entry at the end of the current catalog. The arguments should
form an hash table. The valid keys are :
19 years, 9 months
[Po4a-devel][CVS] po4a/t/data-03 man,1.1,1.2 man.addendum1,1.1,1.2 man.addendum2,1.1,1.2 man.addendum3,1.1,1.2 man.fr.add1,1.1,1.2 man.po-ok,1.1,1.2
by Martin Quinson
Update of /cvsroot/po4a/po4a/t/data-03
In directory haydn:/tmp/cvs-serv8510
Modified Files:
man man.addendum1 man.addendum2 man.addendum3 man.fr.add1
man.po-ok
Log Message:
Fix some of the bugs in the test itself about nf/fi madness. Does not fix everything. Sorry, too short of time for today. Tomorow maybe
Index: man
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-03/man,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man 7 Nov 2003 15:10:17 -0000 1.1
+++ man 8 Aug 2004 20:37:14 -0000 1.2
@@ -9,14 +9,13 @@
0
.
1
-.fi
.SH Section2
Lalala
{
}
.
bliblu
-.fi
+.nf
.SH Section3
.IR .i. .r. .I. .R. to\ be\ continued
.
@@ -24,4 +23,4 @@
.
\fB bold \fR\fI italic\fP\fB bold again \fR
.fi
-.fi
+The default is "^([ \n\t]*[|>:}#])+"
Index: man.po-ok
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-03/man.po-ok,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man.po-ok 7 Nov 2003 15:10:18 -0000 1.1
+++ man.po-ok 8 Aug 2004 20:37:14 -0000 1.2
@@ -1,7 +1,7 @@
# Test po file for man
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+#
#, fuzzy
msgid ""
msgstr ""
@@ -15,51 +15,51 @@
"Content-Transfer-Encoding: 8bit\n"
# type: TH
-#: data/man:2 data/man:2
+#: data/man:1 data/man:1
#, no-wrap
msgid "test"
msgstr "test"
# type: TH
-#: data/man:2
+#: data/man:1
#, no-wrap
msgid "TEST"
msgstr "TEST"
# type: SH
-#: data/man:3
+#: data/man:2
#, no-wrap
msgid "Section1"
msgstr "Sous-titre 1"
# type: Plain text
-#: data/man:7
+#: data/man:6
msgid "blibli B<blabla> bloblo"
msgstr "blabla B<blibli> blublu"
# type: Plain text
-#: data/man:9
+#: data/man:8
msgid "B<blabla>"
msgstr "B<Blahbla>"
# type: Plain text
-#: data/man:11
+#: data/man:10
msgid "0"
msgstr "0"
# type: Plain text
-#: data/man:13
+#: data/man:12
msgid "1"
msgstr "1"
# type: SH
-#: data/man:14
+#: data/man:13
#, no-wrap
msgid "Section2"
msgstr "Sous-titre 2"
# type: Plain text
-#: data/man:18
+#: data/man:17
#, no-wrap
msgid ""
"Lalala\n"
@@ -71,31 +71,36 @@
" }\n"
# type: Plain text
-#: data/man:20
+#: data/man:19
msgid "bliblu"
msgstr "blubli"
# type: SH
-#: data/man:21
+#: data/man:20
#, no-wrap
msgid "Section3"
msgstr "Sous-titre 3"
# type: Plain text
-#: data/man:23
+#: data/man:22
#, no-wrap
msgid "I<.i.>.r.I<.I.>.R.I<to be continued>\n"
msgstr "I<.i.>.r.I<.I.>.R.I<À suivre>\n"
# type: Plain text
-#: data/man:25
+#: data/man:24
#, no-wrap
msgid "B< bold text > back to roman I< italic text > back to roman\n"
msgstr ""
"B< texte gras > retour à roman I< texte italique > retour à roman\n"
# type: Plain text
-#: data/man:27
+#: data/man:26
#, no-wrap
msgid "B< bold >I< italic>B< bold again >\n"
msgstr "B<gras >I< italique >B< gras à nouveau>\n"
+
+# type: Plain text
+#: data/man:28
+msgid "The default is \"^([ \\n\\t]*[|E<gt>:}#])+\""
+msgstr "Le reglage par defaut est \"^([ \\n\\t]*[|E<gt>:}#])+\""
Index: man.addendum2
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-03/man.addendum2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man.addendum2 7 Nov 2003 15:10:17 -0000 1.1
+++ man.addendum2 8 Aug 2004 20:37:14 -0000 1.2
@@ -1,4 +1,3 @@
-PO4A-HEADER:position=Sous-titre 2;mode=before;endboundary=^\.fi$
+PO4A-HEADER:position=Sous-titre 2;mode=before
.SH Added Section
Some content
-.fi
Index: man.addendum3
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-03/man.addendum3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man.addendum3 7 Nov 2003 15:10:17 -0000 1.1
+++ man.addendum3 8 Aug 2004 20:37:14 -0000 1.2
@@ -1,4 +1,4 @@
-PO4A-HEADER:position=Sous-titre 2;mode=after;beginboundary=^\.fi$
+PO4A-HEADER:position=Sous-titre 2;mode=after;beginboundary=^\.SH$
.SH Added Section
Some content
.fi
Index: man.fr.add1
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-03/man.fr.add1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man.fr.add1 7 Nov 2003 15:10:17 -0000 1.1
+++ man.fr.add1 8 Aug 2004 20:37:14 -0000 1.2
@@ -9,14 +9,13 @@
0
.
1
-.fi
.SH "Sous-titre 2"
Lalala
{
}
.
blubli
-.fi
+.nf
.SH Added Section
Some content
.fi
Index: man.addendum1
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-03/man.addendum1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man.addendum1 7 Nov 2003 15:10:17 -0000 1.1
+++ man.addendum1 8 Aug 2004 20:37:14 -0000 1.2
@@ -1,4 +1,4 @@
-PO4A-HEADER:position=Sous-titre 2;mode=after;endboundary=^\.fi$
+PO4A-HEADER:position=Sous-titre 2;mode=after;beginboundary=^\.SH$
.SH Added Section
Some content
.fi
19 years, 9 months
[Po4a-devel][CVS] po4a/lib/Locale/Po4a Man.pm,1.22,1.23
by Martin Quinson
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv8467/lib/Locale/Po4a
Modified Files:
Man.pm
Log Message:
Clarify a comment
Index: Man.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Man.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Man.pm 7 Aug 2004 04:51:33 -0000 1.22
+++ Man.pm 8 Aug 2004 20:36:19 -0000 1.23
@@ -629,7 +629,7 @@
# .\" => comments
# . => empty point on the line
# .tr abcd...
- # => Translate a to b, c to d, etc. on output.
+ # => substitution like Perl's tr/ac/bd/ on output.
if ($macro eq '\"' || $macro eq '' || $macro eq 'tr') {
$self->pushline($line."\n");
goto LINE;
19 years, 9 months
[Po4a-devel][CVS] po4a/lib/Locale/Po4a Po.pm,1.21,1.22 TransTractor.pm,1.31,1.32
by Martin Quinson
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv6758
Modified Files:
Po.pm TransTractor.pm
Log Message:
Do not create the path to file when no path specified (ie, file local) since the method fails miserably in that case
Index: Po.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Po.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Po.pm 8 Aug 2004 11:31:07 -0000 1.21
+++ Po.pm 8 Aug 2004 19:58:48 -0000 1.22
@@ -224,11 +224,12 @@
} else {
# make sure the directory in which we should write the localized file exists
my $dir = $filename;
- $dir =~ s|/[^/]*$||;
+ if ($dir =~ m|/|) {
+ $dir =~ s|/[^/]*$||;
- File::Path::mkpath($dir, 0, 0755) # Croaks on error
- if (length ($dir) && ! -e $dir);
-
+ File::Path::mkpath($dir, 0, 0755) # Croaks on error
+ if (length ($dir) && ! -e $dir);
+ }
open $fh,">$filename"
|| croak (sprintf((dgettext("po4a","Can't write to %s: %s"),$filename,$!))."\n");
}
Index: TransTractor.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/TransTractor.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- TransTractor.pm 7 Aug 2004 23:59:02 -0000 1.31
+++ TransTractor.pm 8 Aug 2004 19:58:48 -0000 1.32
@@ -381,11 +381,12 @@
} else {
# make sure the directory in which we should write the localized file exists
my $dir = $filename;
- $dir =~ s|/[^/]*$||;
+ if ($dir =~ m|/|) {
+ $dir =~ s|/[^/]*$||;
- File::Path::mkpath($dir, 0, 0755) # Croaks on error
- if (length ($dir) && ! -e $dir);
-
+ File::Path::mkpath($dir, 0, 0755) # Croaks on error
+ if (length ($dir) && ! -e $dir);
+ }
open $fh,">$filename"
|| croak (sprintf((dgettext("po4a","can't write to %s: %s"),$filename,$!))."\n");
}
19 years, 9 months
[Po4a-devel][CVS] po4a/debian changelog,1.72,1.73
by Martin Quinson
Update of /cvsroot/po4a/po4a/debian
In directory haydn:/tmp/cvs-serv15240/debian
Modified Files:
changelog
Log Message:
document last changes
Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/debian/changelog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- changelog 8 Aug 2004 16:16:34 -0000 1.72
+++ changelog 8 Aug 2004 19:58:04 -0000 1.73
@@ -4,6 +4,12 @@
[Jordi Vilalta]
- [Build.PL] Ensure we run the tests before distributing a new release
+
+ [Martin Quinson]
+ - Fix test so that they stop make sure that the nf/fi bug of man is still
+ there. Test that it does not come back instead.
+ - Do not try (and fail miserably) to create path to output file when it's
+ in the current directory.
-- Martin Quinson <martin.quinson(a)tuxfamily.org> Tue, 8 Aug 2004 18:11:00 +0200
19 years, 9 months
[Po4a-devel][CVS] po4a/t/data-02 man,1.1,1.2 man.fr,1.1,1.2 man.po,1.3,1.4 man.po-empty,1.2,1.3 man.po-ok,1.2,1.3
by Martin Quinson
Update of /cvsroot/po4a/po4a/t/data-02
In directory haydn:/tmp/cvs-serv31330
Modified Files:
man man.fr man.po man.po-empty man.po-ok
Log Message:
Stop testing that the nf/fi bug is still there. Test that it does not come back instead ;)
Index: man
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-02/man,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man 7 Nov 2003 15:10:17 -0000 1.1
+++ man 8 Aug 2004 19:18:56 -0000 1.2
@@ -9,20 +9,18 @@
0
.
1
-.fi
.SH Section2
Lalala
{
}
.
bliblu
-.fi
+.nf
.SH Section3
.IR .i. .r. .I. .R. to\ be\ continued
.
\fB bold text \fR back to roman \fI italic text \fR back to roman
.
\fB bold \fR\fI italic\fP\fB bold again \fR
-.fi
.fi
The default is "^([ \n\t]*[|>:}#])+"
Index: man.po-empty
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-02/man.po-empty,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- man.po-empty 29 Jun 2004 20:13:44 -0000 1.2
+++ man.po-empty 8 Aug 2004 19:18:56 -0000 1.3
@@ -53,13 +53,13 @@
msgstr ""
# type: SH
-#: data-02/man:13
+#: data-02/man:12
#, no-wrap
msgid "Section2"
msgstr ""
# type: Plain text
-#: data-02/man:17
+#: data-02/man:16
#, no-wrap
msgid ""
"Lalala\n"
@@ -68,36 +68,35 @@
msgstr ""
# type: Plain text
-#: data-02/man:19
+#: data-02/man:18
msgid "bliblu"
msgstr ""
# type: SH
-#: data-02/man:20
+#: data-02/man:19
#, no-wrap
msgid "Section3"
msgstr ""
# type: Plain text
-#: data-02/man:22
+#: data-02/man:21
#, no-wrap
msgid "I<.i.>.r.I<.I.>.R.I<to be continued>\n"
msgstr ""
# type: Plain text
-#: data-02/man:24
+#: data-02/man:23
#, no-wrap
msgid "B< bold text > back to roman I< italic text > back to roman\n"
msgstr ""
# type: Plain text
-#: data-02/man:26
+#: data-02/man:25
#, no-wrap
msgid "B< bold >I< italic>B< bold again >\n"
msgstr ""
# type: Plain text
-#: data-02/man:28
-#, no-wrap
-msgid "The default is \"^([ \\n\\t]*[|E<gt>:}#])+\"\n"
+#: data-02/man:26
+msgid "The default is \"^([ \\n\\t]*[|E<gt>:}#])+\""
msgstr ""
Index: man.fr
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-02/man.fr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- man.fr 7 Nov 2003 15:10:17 -0000 1.1
+++ man.fr 8 Aug 2004 19:18:56 -0000 1.2
@@ -9,20 +9,18 @@
0
.
1
-.fi
.SH "Sous-titre 2"
Lalala
{
}
.
blubli
-.fi
+.nf
.SH "Sous-titre 3"
.I .i.\fR.r.\fI.I.\fR.R.\fIÀ suivre
.
\fB texte gras \fR retour à roman \fI texte italique \fR retour à roman
.
.B gras \fR\fI italique \fR\fB gras à nouveau
-.fi
.fi
Le reglage par defaut est "^([ \n\t]*[|>:}#])+"
Index: man.po
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-02/man.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- man.po 29 Jun 2004 20:13:44 -0000 1.3
+++ man.po 8 Aug 2004 19:18:56 -0000 1.4
@@ -57,13 +57,13 @@
msgstr "1"
# type: SH
-#: data-02/man:13
+#: data-02/man:12
#, fuzzy, no-wrap
msgid "Section2"
msgstr "Sous-titre 2"
# type: Plain text
-#: data-02/man:17
+#: data-02/man:16
#, fuzzy, no-wrap
msgid ""
"Lalala\n"
@@ -75,37 +75,37 @@
" }\n"
# type: Plain text
-#: data-02/man:19
+#: data-02/man:18
#, fuzzy
msgid "bliblu"
msgstr "blubli"
# type: SH
-#: data-02/man:20
+#: data-02/man:19
#, fuzzy, no-wrap
msgid "Section3"
msgstr "Sous-titre 3"
# type: Plain text
-#: data-02/man:22
+#: data-02/man:21
#, fuzzy, no-wrap
msgid "I<.i.>.r.I<.I.>.R.I<to be continued>\n"
msgstr "I<.i.>.r.I<.I.>.R.I<À suivre>\n"
# type: Plain text
-#: data-02/man:24
+#: data-02/man:23
#, fuzzy, no-wrap
msgid "B< bold text > back to roman I< italic text > back to roman\n"
msgstr "B< texte gras > retour à roman I< texte italique > retour à roman\n"
# type: Plain text
-#: data-02/man:26
+#: data-02/man:25
#, fuzzy, no-wrap
msgid "B< bold >I< italic>B< bold again >\n"
msgstr "B<gras >I< italique >B< gras à nouveau>\n"
# type: Plain text
-#: data-02/man:28
-#, fuzzy, no-wrap
-msgid "The default is \"^([ \\n\\t]*[|E<gt>:}#])+\"\n"
-msgstr "Le reglage par defaut est \"^([ \\n\\t]*[|E<gt>:}#])+\"\n"
+#: data-02/man:26
+#, fuzzy
+msgid "The default is \"^([ \\n\\t]*[|E<gt>:}#])+\""
+msgstr "Le reglage par defaut est \"^([ \\n\\t]*[|E<gt>:}#])+\""
Index: man.po-ok
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-02/man.po-ok,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- man.po-ok 29 Jun 2004 20:13:44 -0000 1.2
+++ man.po-ok 8 Aug 2004 19:18:56 -0000 1.3
@@ -102,6 +102,5 @@
# type: Plain text
#: data/man:28
-#, no-wrap
-msgid "The default is \"^([ \\n\\t]*[|E<gt>:}#])+\"\n"
-msgstr "Le reglage par defaut est \"^([ \\n\\t]*[|E<gt>:}#])+\"\n"
+msgid "The default is \"^([ \\n\\t]*[|E<gt>:}#])+\""
+msgstr "Le reglage par defaut est \"^([ \\n\\t]*[|E<gt>:}#])+\""
19 years, 9 months
[Po4a-devel][CVS] po4a/lib/Locale/Po4a Xml.pm,1.14,1.15
by Jordi Vilalta
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv24538
Modified Files:
Xml.pm
Log Message:
Xml now also recodes the excluded strings (just waiting for the TT update to
be fully functional)
Index: Xml.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Xml.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Xml.pm 8 Aug 2004 18:44:56 -0000 1.14
+++ Xml.pm 8 Aug 2004 19:10:25 -0000 1.15
@@ -771,9 +771,9 @@
if ($self->tag_in_list($self->get_path.$name,@{$self->{attributes}})) {
$text .= $self->found_string($value, $ref, { type=>"attribute", attribute=>$name });
} else {
- $text .= $value;
print sprintf("po4a::xml: ".dgettext ("po4a","Contents of attribute %s excluded: %s"),$self->get_path.$name,$value)."\n"
if $self->debug();
+ $text .= $self->recode_skipped_text($value);
}
$text .= $quot;
}
@@ -875,7 +875,7 @@
# Inform that this tag isn't translated in debug mode
print sprintf("po4a::xml: ".dgettext ("po4a","Contents of tag %s excluded: %s"), $self->get_path,$self->join_lines(@paragraph))."\n"
if $self->debug();
- $self->pushline($self->join_lines(@paragraph));
+ $self->pushline($self->recode_skipped_text($self->join_lines(@paragraph)));
}
}
19 years, 9 months