tags 272639 patch
thanks
Quoting Christian Perrier ([EMAIL PROTECTED]):
> Package: countrychooser
> Severity: normal
> Tags: l10n d-i
>
> As a side effect of the use of a master file for French translations, the
> countrychooser templates currently use ISO-8859-1 encoding.
>
> As they are merged with translations from iso-codes in a way which does not
> allow using different encodings, these French translation currently use
> wrong encoding for country names.
I made a minor rewirte of the mktemplates script which shoul davoid
such mess when different encodings are used.
diff -Nru countrychooser/mktemplates countrychooser.new/mktemplates
--- countrychooser/mktemplates 2004-09-20 18:39:09.000000000 +0200
+++ countrychooser.new/mktemplates 2004-09-21 09:14:33.000000000 +0200
@@ -64,12 +64,14 @@
perl -pe 'BEGIN { $marker=shift } s/^msg(id|str) "(.+)"/msg$1 "$marker$2"/'
"$INDENTMARKER" \
< $ISO3166TRANSLATIONS/$pofilename \
> $ISO3166TRANSLATIONS/$pofilename.munged
-
- msgmerge -C debian/po/$pofilename \
- -C $ISO3166TRANSLATIONS/$pofilename.munged \
- /dev/null \
- debian/pobuild/templates.pot \
- > debian/pobuild/$pofilename
+
+ # msgcat will properly handle different encodings
+ msgcat debian/po/$pofilename \
+ $ISO3166TRANSLATIONS/$pofilename.munged \
+ > debian/pobuild/$pofilename
+
+ msgmerge -U debian/pobuild/$pofilename \
+ debian/pobuild/templates.pot
# Else we just use what's translated
else
cp $pofile debian/pobuild/$pofilename
