From: Bruno Haible Date: Tue, 9 Oct 2007 13:53:57 +0000 (+0000) Subject: Test kde-format and format recognition heuristics. X-Git-Tag: v0.17~140 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86cb64d10f76e43040a37361b4a5731ae579cf7f;p=thirdparty%2Fgettext.git Test kde-format and format recognition heuristics. --- diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 3fcc4e47d..4aaee9e8d 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,8 @@ +2007-10-09 Bruno Haible + + * xgettext-c-17: New file. + * Makefile.am (TESTS): Add it. + 2007-10-07 Bruno Haible * tstgettext.c (main): In the --version output, say GPLv3+. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index 34069abbd..405709389 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -71,7 +71,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \ xgettext-c-1 xgettext-c-2 xgettext-c-3 xgettext-c-4 xgettext-c-5 \ xgettext-c-6 xgettext-c-7 xgettext-c-8 xgettext-c-9 xgettext-c-10 \ xgettext-c-11 xgettext-c-12 xgettext-c-13 xgettext-c-14 xgettext-c-15 \ - xgettext-c-16 \ + xgettext-c-16 xgettext-c-17 \ xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \ xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \ xgettext-csharp-7 \ diff --git a/gettext-tools/tests/xgettext-c-17 b/gettext-tools/tests/xgettext-c-17 new file mode 100755 index 000000000..011c77878 --- /dev/null +++ b/gettext-tools/tests/xgettext-c-17 @@ -0,0 +1,45 @@ +#! /bin/sh + +# Test C++ support: test kde-format and format recognition heuristics. + +tmpfiles="" +trap 'rm -fr $tmpfiles' 1 2 3 15 + +tmpfiles="$tmpfiles xg-c-17.cc" +cat <<\EOF > xg-c-17.cc +/* When xgettext has no info, it flags both c-format and kde-format, based + on the heuristics. */ +gettext ("used time: %1m %2s"); + +/* When the programmer says it's kde-format, xgettext does not apply the + heuristics. */ +/* xgettext: kde-format */ +gettext ("remaining time: %1m %2s"); +EOF + +tmpfiles="$tmpfiles xg-c-17.tmp.po xg-c-17.po" +: ${XGETTEXT=xgettext} +${XGETTEXT} --omit-header --no-location -d xg-c-17.tmp --language=C++ --kde \ + xg-c-17.cc +test $? = 0 || { rm -fr $tmpfiles; exit 1; } +tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po +test $? = 0 || { rm -fr $tmpfiles; exit 1; } + +tmpfiles="$tmpfiles xg-c-17.ok" +cat < xg-c-17.ok +#, c-format, kde-format +msgid "used time: %1m %2s" +msgstr "" + +#, kde-format +msgid "remaining time: %1m %2s" +msgstr "" +EOF + +: ${DIFF=diff} +${DIFF} xg-c-17.ok xg-c-17.po +result=$? + +rm -fr $tmpfiles + +exit $result