From 7994f86ec5e18f9d0d9f90161a2f26dd26d26af7 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 4 Jul 2021 03:01:24 +0000 Subject: CTAN sync 202107040301 --- .../tp/maintain/lib/libintl-perl/tests/03npgettext_pp.t | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'macros/texinfo/texinfo/tp/maintain/lib/libintl-perl/tests/03npgettext_pp.t') diff --git a/macros/texinfo/texinfo/tp/maintain/lib/libintl-perl/tests/03npgettext_pp.t b/macros/texinfo/texinfo/tp/maintain/lib/libintl-perl/tests/03npgettext_pp.t index 0ec2d0a670..7ff7c05ee9 100644 --- a/macros/texinfo/texinfo/tp/maintain/lib/libintl-perl/tests/03npgettext_pp.t +++ b/macros/texinfo/texinfo/tp/maintain/lib/libintl-perl/tests/03npgettext_pp.t @@ -7,7 +7,7 @@ use strict; use Test; -use constant NUM_TESTS => 99; +use constant NUM_TESTS => 109; use Locale::Messages qw (bindtextdomain textdomain npgettext); require POSIX; @@ -35,7 +35,7 @@ Locale::Messages::nl_putenv ("LANG=C"); Locale::Messages::nl_putenv ("LC_MESSAGES=C"); Locale::Messages::nl_putenv ("OUTPUT_CHARSET=iso-8859-1"); -POSIX::setlocale (POSIX::LC_ALL() => ''); +Locale::Messages::setlocale (POSIX::LC_ALL() => ''); my $locale_dir = $0; $locale_dir =~ s,[^\\/]+$,, or $locale_dir = '.'; @@ -70,7 +70,7 @@ Locale::Messages::nl_putenv ("LC_ALL=C"); Locale::Messages::nl_putenv ("LANG=C"); Locale::Messages::nl_putenv ("LC_MESSAGES=C"); -POSIX::setlocale (POSIX::LC_ALL() => ''); +Locale::Messages::setlocale (POSIX::LC_ALL() => ''); my $bound_dir = bindtextdomain $textdomain => $locale_dir; @@ -92,13 +92,13 @@ Locale::Messages::nl_putenv ("LANGUAGE=de_AT"); Locale::Messages::nl_putenv ("LC_ALL=de_AT"); Locale::Messages::nl_putenv ("LANG=de_AT"); Locale::Messages::nl_putenv ("LC_MESSAGES=de_AT"); -my $missing_locale = POSIX::setlocale (POSIX::LC_ALL() => '') ? +my $missing_locale = Locale::Messages::setlocale (POSIX::LC_ALL() => '') ? '' : 'locale de_AT missing'; for (0 .. 9) { my $translation = npgettext ($context, $strings[0], $strings[1], $_); my $expected = $_ == 1 ? 'Einzahl 2' : 'Mehrzahl 2'; - ok $translation, $expected; + skip skip $missing_locale, $translation, $expected; } $textdomain = 'additional'; @@ -107,7 +107,7 @@ Locale::Messages::nl_putenv ("LC_ALL=C"); Locale::Messages::nl_putenv ("LANG=C"); Locale::Messages::nl_putenv ("LC_MESSAGES=C"); -POSIX::setlocale (POSIX::LC_ALL() => ''); +Locale::Messages::setlocale (POSIX::LC_ALL() => ''); $bound_dir = bindtextdomain $textdomain => $locale_dir; @@ -130,14 +130,14 @@ Locale::Messages::nl_putenv ("LC_ALL=de_AT"); Locale::Messages::nl_putenv ("LANG=de_AT"); Locale::Messages::nl_putenv ("LC_MESSAGES=de_AT"); -POSIX::setlocale (POSIX::LC_ALL() => ''); +Locale::Messages::setlocale (POSIX::LC_ALL() => ''); for (0 .. 40) { my $translation = npgettext ($context, $strings[0], $strings[1], $_); my $plural = ($_ == 1 ? 0 : $_ % 10 == 2 ? 1 : $_ % 10 == 3 || $_ %10 == 4 ? 2 : 3); - ok $translation, "Numerus 2:$plural"; + skip $missing_locale, $translation, "Numerus 2:$plural"; } __END__ -- cgit v1.2.3