diff options
| author | Daiki Ueno <ueno@gnu.org> | 2013-06-17 11:56:41 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2013-06-17 12:23:43 +0900 |
| commit | 4db97420210b1393566e9d361ca8253f60aad3d0 (patch) | |
| tree | 889bac7d9fa893e1450784e565089f12d660547b /gettext-tools | |
| parent | 51d87a61197ef9c78b97de291535d0e005b6385c (diff) | |
| download | external_gettext-4db97420210b1393566e9d361ca8253f60aad3d0.zip external_gettext-4db97420210b1393566e9d361ca8253f60aad3d0.tar.gz external_gettext-4db97420210b1393566e9d361ca8253f60aad3d0.tar.bz2 | |
Enable python-brace-format detection by default.
Diffstat (limited to 'gettext-tools')
| -rw-r--r-- | gettext-tools/src/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-tools/src/x-python.c | 12 | ||||
| -rw-r--r-- | gettext-tools/tests/ChangeLog | 5 | ||||
| -rwxr-xr-x | gettext-tools/tests/format-python-brace-1 | 2 |
4 files changed, 23 insertions, 1 deletions
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 45d639b..ce6b6c8 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,5 +1,10 @@ 2013-06-17 Daiki Ueno <ueno@gnu.org> + * x-python.c (init_flag_table_python): Enable python-brace-format + by default. + +2013-06-17 Daiki Ueno <ueno@gnu.org> + * x-glade.c (start_element_null): New function. (end_element_null): New function. (element_parser_null): New variable. diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c index a3a106c..faafa50 100644 --- a/gettext-tools/src/x-python.c +++ b/gettext-tools/src/x-python.c @@ -133,6 +133,18 @@ init_flag_table_python () xgettext_record_flag ("dngettext:3:pass-python-format"); xgettext_record_flag ("_:1:pass-python-format"); /* xgettext_record_flag ("%:1:python-format"); // % is an infix operator! */ + + xgettext_record_flag ("gettext:1:pass-python-brace-format"); + xgettext_record_flag ("ugettext:1:pass-python-brace-format"); + xgettext_record_flag ("dgettext:2:pass-python-brace-format"); + xgettext_record_flag ("ngettext:1:pass-python-brace-format"); + xgettext_record_flag ("ngettext:2:pass-python-brace-format"); + xgettext_record_flag ("ungettext:1:pass-python-brace-format"); + xgettext_record_flag ("ungettext:2:pass-python-brace-format"); + xgettext_record_flag ("dngettext:2:pass-python-brace-format"); + xgettext_record_flag ("dngettext:3:pass-python-brace-format"); + xgettext_record_flag ("_:1:pass-python-brace-format"); + /* xgettext_record_flag ("format:1:python-brace-format"); */ } diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index f9c4073..2ed5f27 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,5 +1,10 @@ 2013-06-17 Daiki Ueno <ueno@gnu.org> + * format-python-brace-1: No need to pass + --flag=gettext:1:pass-python-brace-format to xgettext. + +2013-06-17 Daiki Ueno <ueno@gnu.org> + * Makefile.am: Rename xgettext-gtkbuilder-* to xgettext-glade-* as the current GtkBuilder support is implemented as a variant of Glade. diff --git a/gettext-tools/tests/format-python-brace-1 b/gettext-tools/tests/format-python-brace-1 index 3446230..1c4f468 100755 --- a/gettext-tools/tests/format-python-brace-1 +++ b/gettext-tools/tests/format-python-brace-1 @@ -42,7 +42,7 @@ while read comment; do cat <<EOF > f-pyb-1-$n.in gettext(${string}); EOF - ${XGETTEXT} -L Python --flag=gettext:1:pass-python-brace-format -o f-pyb-1-$n.po f-pyb-1-$n.in || exit 1 + ${XGETTEXT} -L Python -o f-pyb-1-$n.po f-pyb-1-$n.in || exit 1 test -f f-pyb-1-$n.po || exit 1 fail= if echo "$comment" | grep 'Valid:' > /dev/null; then |