mirror of
https://https.git.savannah.gnu.org/git/gettext.git
synced 2026-01-26 15:39:11 +00:00
c2758ebe0a
* gettext-tools/src/message.h (format_type): Add format_java_printf. (NFORMATS): Increment. * gettext-tools/src/message.c (format_language, format_language_pretty): Add entry for format_java_printf. * gettext-tools/src/format.h (formatstring_java_printf): New declaration. * gettext-tools/src/format-java.c: Update comments. * gettext-tools/src/format-java-printf.c: New file. * gettext-tools/src/format.c (formatstring_parsers): Add entry for format_java_printf. * gettext-tools/src/x-java.h (SCANNERS_JAVA): Use formatstring_java_printf. * gettext-tools/src/x-java.c (init_flag_table_java): Add entries relevant to format strings in Formatter syntax. * gettext-tools/src/xgettext.c (xgettext_record_flag): Add support for format_java_printf. * gettext-tools/src/FILES: Add format-java-printf.c. * gettext-tools/src/Makefile.am (FORMAT_SOURCE): Add format-java-printf.c. * gettext-tools/woe32dll/gettextsrc-exports.c: Export formatstring_java_printf. * gettext-tools/libgettextpo/Makefile.am (libgettextpo_la_AUXSOURCES): Likewise. * gettext-tools/tests/xgettext-6 (xg-test6.java): Add test for recognition of format strings in Formatter syntax. * gettext-tools/tests/format-java-printf-1: New file. * gettext-tools/tests/format-java-printf-2: New file. * gettext-tools/tests/Makefile.am (TESTS): Add them. * gettext-tools/tests/lang-java: Add two uses of String.format to the program. * gettext-tools/doc/gettext.texi (PO Files): Document java-printf-format and no-java-printf-format. (java-format): Describe both kinds of format strings. Update URLs. (Java): Mention the second kind of format string as well. * NEWS: Mention the improvement.
287 lines
5.7 KiB
Bash
Executable File
287 lines
5.7 KiB
Bash
Executable File
#! /bin/sh
|
|
. "${srcdir=.}/init.sh"; path_prepend_ . ../src
|
|
|
|
# Test checking of Java printf format strings.
|
|
|
|
cat <<\EOF > f-jp-2.data
|
|
# Valid: %% doesn't count
|
|
msgid "abc%%def"
|
|
msgstr "xyz"
|
|
# Invalid: invalid msgstr
|
|
msgid "abc%%def"
|
|
msgstr "xyz%"
|
|
# Valid: same arguments
|
|
msgid "abc%s%xdef"
|
|
msgstr "xyz%s%x"
|
|
# Valid: same arguments, with different widths
|
|
msgid "abc%2sdef"
|
|
msgstr "xyz%3s"
|
|
# Valid: same arguments but in numbered syntax
|
|
msgid "abc%s%xdef"
|
|
msgstr "xyz%1$s%2$x"
|
|
# Valid: permutation
|
|
msgid "abc%s%x%cdef"
|
|
msgstr "xyz%3$c%2$x%1$s"
|
|
# Invalid: too few arguments
|
|
msgid "abc%2$xdef%1$s"
|
|
msgstr "xyz%1$s"
|
|
# Invalid: too few arguments
|
|
msgid "abc%sdef%x"
|
|
msgstr "xyz%s"
|
|
# Invalid: too many arguments
|
|
msgid "abc%xdef"
|
|
msgstr "xyz%xvw%c"
|
|
# Valid: same numbered arguments, with different widths
|
|
msgid "abc%2$5s%1$4s"
|
|
msgstr "xyz%2$4s%1$5s"
|
|
# Invalid: missing argument
|
|
msgid "abc%2$sdef%1$x"
|
|
msgstr "xyz%1$x"
|
|
# Invalid: missing argument
|
|
msgid "abc%1$sdef%2$x"
|
|
msgstr "xyz%2$x"
|
|
# Invalid: added argument
|
|
msgid "abc%1$xdef"
|
|
msgstr "xyz%1$xvw%2$c"
|
|
# Valid: type compatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%B"
|
|
# Valid: type compatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%H"
|
|
# Valid: type compatibility
|
|
msgid "abc%s"
|
|
msgstr "xyz%S"
|
|
# Valid: type compatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%h"
|
|
# Valid: type compatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%s"
|
|
# Valid: type compatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%s"
|
|
# Valid: type compatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%C"
|
|
# Valid: type compatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%o"
|
|
# Valid: type compatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%x"
|
|
# Valid: type compatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%X"
|
|
# Valid: type compatibility
|
|
msgid "abc%o"
|
|
msgstr "xyz%x"
|
|
# Valid: type compatibility
|
|
msgid "abc%o"
|
|
msgstr "xyz%X"
|
|
# Valid: type compatibility
|
|
msgid "abc%x"
|
|
msgstr "xyz%X"
|
|
# Valid: type compatibility
|
|
msgid "abc%e"
|
|
msgstr "xyz%E"
|
|
# Valid: type compatibility
|
|
msgid "abc%g"
|
|
msgstr "xyz%G"
|
|
# Valid: type compatibility
|
|
msgid "abc%a"
|
|
msgstr "xyz%A"
|
|
# Valid: type compatibility
|
|
msgid "abc%e"
|
|
msgstr "xyz%f"
|
|
# Valid: type compatibility
|
|
msgid "abc%e"
|
|
msgstr "xyz%g"
|
|
# Valid: type compatibility
|
|
msgid "abc%e"
|
|
msgstr "xyz%a"
|
|
# Valid: type compatibility
|
|
msgid "abc%f"
|
|
msgstr "xyz%g"
|
|
# Valid: type compatibility
|
|
msgid "abc%f"
|
|
msgstr "xyz%a"
|
|
# Valid: type compatibility
|
|
msgid "abc%g"
|
|
msgstr "xyz%a"
|
|
# Valid: type compatibility
|
|
msgid "abc%tF"
|
|
msgstr "xyz%Tz"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%c"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%d"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%o"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%x"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%e"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%f"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%g"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%a"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%b"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%c"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%d"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%o"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%x"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%e"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%f"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%g"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%a"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%h"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%d"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%o"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%x"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%e"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%f"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%g"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%a"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%c"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%e"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%f"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%g"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%a"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%d"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%o"
|
|
msgstr "xyz%e"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%o"
|
|
msgstr "xyz%f"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%o"
|
|
msgstr "xyz%g"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%o"
|
|
msgstr "xyz%a"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%o"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%x"
|
|
msgstr "xyz%e"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%x"
|
|
msgstr "xyz%f"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%x"
|
|
msgstr "xyz%g"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%x"
|
|
msgstr "xyz%a"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%x"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%e"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%f"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%g"
|
|
msgstr "xyz%tF"
|
|
# Invalid: type incompatibility
|
|
msgid "abc%a"
|
|
msgstr "xyz%tF"
|
|
EOF
|
|
|
|
: ${MSGFMT=msgfmt}
|
|
n=0
|
|
while read comment; do
|
|
read msgid_line
|
|
read msgstr_line
|
|
n=`expr $n + 1`
|
|
cat <<EOF > f-jp-2-$n.po
|
|
#, java-printf-format
|
|
${msgid_line}
|
|
${msgstr_line}
|
|
EOF
|
|
fail=
|
|
if echo "$comment" | grep 'Valid:' > /dev/null; then
|
|
if ${MSGFMT} --check-format -o f-jp-2-$n.mo f-jp-2-$n.po; then
|
|
:
|
|
else
|
|
fail=yes
|
|
fi
|
|
else
|
|
${MSGFMT} --check-format -o f-jp-2-$n.mo f-jp-2-$n.po 2> /dev/null
|
|
if test $? = 1; then
|
|
:
|
|
else
|
|
fail=yes
|
|
fi
|
|
fi
|
|
if test -n "$fail"; then
|
|
echo "Format string checking error:" 1>&2
|
|
cat f-jp-2-$n.po 1>&2
|
|
Exit 1
|
|
fi
|
|
rm -f f-jp-2-$n.po f-jp-2-$n.mo
|
|
done < f-jp-2.data
|
|
|
|
Exit 0
|