Your message dated Wed, 15 Mar 2006 13:48:43 -0800
with message-id <[EMAIL PROTECTED]>
and subject line Bug#230838: fixed in po-debconf 1.0
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: intltool-debian
Version: 0.27.2+20031023
Severity: wishlist
Tags: patch
When a Choices entry is splitted, in debconf templates, to several strings,
by the use of the "__Choices" trick, the translations need to be complete in
each language.
This has drawbacks in some cases, for instance, the country list used by
countrychooser.
I suggest trying to use as much translations as possible....and fill the
remaining values with the original strings.
The attached patch for intltool-merge tries to achieve this. I succeded with
it on some tests with po2debconf. However, I did not test it in all cases,
so I cannot guarantee it does not break anything else.
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux mykerinos 2.6.1 #1 Thu Jan 29 19:11:23 CET 2004 i686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (ignored: LC_ALL set to
fr_FR.UTF-8)
Versions of packages intltool-debian depends on:
ii gettext 0.13.1-2 GNU Internationalization utilities
ii perl 5.8.3-1 Larry Wall's Practical Extraction
-- no debconf information
--- intltool-merge.ori 2004-02-02 20:03:50.000000000 +0100
+++ intltool-merge 2004-02-02 20:03:07.000000000 +0100
@@ -918,18 +918,28 @@
if (!$translation)
{
$is_translated = 0;
- last;
+ # last;
+ $str =~ s/\[\s[^\[\]]*\]$//;
+ }
+ else
+ {
+ # $translation may also contain [] dummy
+ # strings, mostly to indicate an empty string
+ $translation =~ s/\[\s[^\[\]]*\]$//;
}
-
- # $translation may also contain [] dummy
- # strings, mostly to indicate an empty string
- $translation =~ s/\[\s[^\[\]]*\]$//;
-
if ($first)
{
if ($underscore eq 2)
{
- $str_translated .= $translation;
+ if ($is_translated eq 1 )
+ {
+ $str_translated .= $translation;
+ }
+ else
+ {
+ $str_translated .= $str;
+ $is_translated = 1;
+ }
}
else
{
@@ -942,7 +952,15 @@
{
if ($underscore eq 2)
{
- $str_translated .= ', ' . $translation;
+ if ($is_translated eq 1 )
+ {
+ $str_translated .= ', ' . $translation;
+ }
+ else
+ {
+ $str_translated .= ', ' . $str;
+ $is_translated = 1;
+ }
}
else
{
@@ -956,8 +974,7 @@
# To fix some problems with Text::Wrap::wrap
$str_translated =~ s/(\n )+\n/\n .\n/g;
}
- next unless $is_translated;
-
+ # next unless $is_translated;
$str_translated =~ s/\n \.\n$//;
$str_translated =~ s/\s+$//;
--- End Message ---
--- Begin Message ---
Source: po-debconf
Source-Version: 1.0
We believe that the bug you reported is fixed in the latest version of
po-debconf, which is due to be installed in the Debian FTP archive:
po-debconf_1.0.dsc
to pool/main/p/po-debconf/po-debconf_1.0.dsc
po-debconf_1.0.tar.gz
to pool/main/p/po-debconf/po-debconf_1.0.tar.gz
po-debconf_1.0_all.deb
to pool/main/p/po-debconf/po-debconf_1.0_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Denis Barbier <[EMAIL PROTECTED]> (supplier of updated po-debconf package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 15 Mar 2006 21:53:28 +0100
Source: po-debconf
Binary: po-debconf
Architecture: source all
Version: 1.0
Distribution: unstable
Urgency: low
Maintainer: Denis Barbier <[EMAIL PROTECTED]>
Changed-By: Denis Barbier <[EMAIL PROTECTED]>
Description:
po-debconf - manage translated Debconf templates files with gettext
Closes: 230838 330096 353436 354583
Changes:
po-debconf (1.0) unstable; urgency=low
.
* debconf2pot: Drop this program, "debconf-updatepo --skip-merge" does
the same job.
.
* po2debconf: Do no more run debconf-updatepo if outdated PO files
are detected. po-debconf(7) already explains why this was not
a good idea.
.
* debconf-gettextize: Cleanup, remove -l/-n/-o flags.
* debconf-gettextize: Add a --choices flag to generate __Choices fields
in the master template file.
* debconf-gettextize: New --merge flag, to merge translations with
existing PO files.
.
* Depend on intltool-debian >= 0.34.1+20060220.
With this version, comments in the form '#flag:' are interpreted by
debconf-updatepo and po2debconf. They are helpful when a translatable
field is composed of several strings. Recognized keywords are:
- #flag:translate:
Write only the specified strings into PO files. Closes: #330096
Thanks Colin Watson.
- #flag:comment:
Comments can be defined for each individual string.
- #flag:partial
This flag prints translated strings even if they are not fully
translated. Closes: #230838 Thanks Christian Perrier.
See details in po-debconf(7).
* This version of intltool-debian also ensures that po2debconf properly
removes comments when they appear at the top or bottom of template
files, which should not occur though.
.
* podebconf-display-po: Add support for Title type. Report and patch
by Thomas Huriaux, thanks. Closes: #354583
.
* podebconf-report-po: Sort PO files.
.
* Add Build-Depends-Indep: po4a.
* Drop debian/README.Debian which was obsolete.
.
* Update documentation.
* Update Russian documentation. Thanks to Yuri Kozlov. (Closes: #353436)
* Partial update of French documentation.
Files:
e2648fba0b2f56ff2f33f8c6fbdaa8d8 515 devel optional po-debconf_1.0.dsc
210c4aab1486743fe3c8400c2325b8a7 109700 devel optional po-debconf_1.0.tar.gz
bba77ca0497a08acf88a4bee498295e7 97348 devel optional po-debconf_1.0_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFEGH9T8Ri1lR4WGvsRAjkhAJ0bn4y5Y1Tpq7H6j99JxpSsKOTSZwCfQ74G
PkqjhmuKrHyMaN6q9tVrfEE=
=pbKY
-----END PGP SIGNATURE-----
--- End Message ---
