From b7aa47e32bb64232577863f8911ac00c03d2de1b Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 10 Sep 2001 10:45:57 +0000 Subject: - rename help-*.po by help-*.pot - fix typo in script removing $lang.po translations to favour help-*.pot --- perl-install/share/po/.cvsignore | 2 +- perl-install/share/po/Makefile | 6 +++--- perl-install/share/po/help_xml2pm.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'perl-install') diff --git a/perl-install/share/po/.cvsignore b/perl-install/share/po/.cvsignore index 5a11b8d84..1ffdd04b6 100644 --- a/perl-install/share/po/.cvsignore +++ b/perl-install/share/po/.cvsignore @@ -2,4 +2,4 @@ *.mo *~ doc -help-*.po +help-*.pot diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile index 5773bace8..6ca5adefa 100644 --- a/perl-install/share/po/Makefile +++ b/perl-install/share/po/Makefile @@ -24,8 +24,8 @@ $(PMSCFILES): %_.c: % ./fake_c.pl $< > $@ $(POFILES): DrakX.pot - perl -ne 'print unless /^#.*\Qdrakx-help.xml/ .. /^$/' $@ > $@t - if [ -e help-$@ ]; then msgmerge -C help-$@ $@t $< > $@; else msgmerge $@t $< > $@; fi + perl -ne 'print unless /^#.*\Qdrakx-help.xml/ .. /^$$/' $@ > $@t + if [ -e help-$@t ]; then msgmerge -C help-$@t $@t $< > $@; else msgmerge $@t $< > $@; fi rm $@t DrakX.pot: $(PMSFILES) @@ -41,7 +41,7 @@ install: done clean: - rm -rf drakx-help.xml doc empty.po tmp.* messages tmp.pot *.mo $(POFILES:%=%t) $(PMSCFILES) + rm -rf drakx-help.xml help-*.po{t,} doc empty.po tmp.* messages tmp.pot *.mo $(POFILES:%=%t) $(PMSCFILES) check: @grep -F '$$' DrakX.pot && { echo "bad translation strings (contains \$$) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"; exit 1; } ||: diff --git a/perl-install/share/po/help_xml2pm.pl b/perl-install/share/po/help_xml2pm.pl index 42c3d59c7..d6b0f8b2c 100755 --- a/perl-install/share/po/help_xml2pm.pl +++ b/perl-install/share/po/help_xml2pm.pl @@ -5,7 +5,7 @@ use MDK::Common; my $help; my $dir = "doc/manual/literal/drakx"; -my @langs = grep { /^..$/ } all($dir); +my @langs = grep { /^..$/ } all($dir) or die "no XML help found in $dir\n"; my %helps = map { my $lang = $_; @@ -20,7 +20,7 @@ save_help($base); foreach my $lang (keys %helps) { local *F; - open F, "> help-$lang.po"; + open F, "> help-$lang.pot"; print F "\n"; foreach my $id (keys %{$helps{$lang}}) { $base->{$id} or die "$lang:$id doesn't exist in english\n"; -- cgit v1.2.1