Enable python-brace-format detection by default.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 45d639b3d017fbd58672772f07708a82ea44a5bb..ce6b6c873ad9a960cc539d360cf18bccf02793b9 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index a3a106cfc1a92c1a6ed4377b7f4ecd3c05aef795..faafa503ec51f1bf448056e97e16048882ba1dbe 100644 (file)
--- 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 f9c4073a3215dd973907f0f50a3e20b46a88b410..2ed5f275c2d7781d500fd3fd98fe0d3b50dd7a53 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gettext-tools/tests/format-python-brace-1 b/gettext-tools/tests/format-python-brace-1
index 34462307aa4e500f3314c605836809931ad5a583..1c4f46843ca9d7aa4dad027d93b943f1af4a574c 100755 (executable)
--- 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