Fix problems with translating English-language diagnostics.

* bootstrap: Fix bug introduced in recent bootstrap changes, with
respect to bison-runtime pot generation.  The YY_ stuff
wasn't being captured.
* bootstrap.conf (XGETTEXT_OPTIONS_RUNTIME): New var.
* po/POTFILES.in: Add src/location.c, src/scan-code.l.
* runtime-po/POTFILES.in: Add data/push.c.

diff --git a/ChangeLog b/ChangeLog
index c0912fb52be6c1e6c0df538541eb591214772ea7..478c6e40bdd9527d6f78971e680f13c49be26d5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix problems with translating English-language diagnostics.
+       * bootstrap: Fix bug introduced in recent bootstrap changes, with
+       respect to bison-runtime pot generation.  The YY_ stuff
+       wasn't being captured.
+       * bootstrap.conf (XGETTEXT_OPTIONS_RUNTIME): New var.
+       * po/POTFILES.in: Add src/location.c, src/scan-code.l.
+       * runtime-po/POTFILES.in: Add data/push.c.
+

 2006-09-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge bootstrap changes from coreutils.
 2006-09-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge bootstrap changes from coreutils.

diff --git a/bootstrap b/bootstrap
index a9124017ad247b39955d2dc5e9a712fcf7c70675..d357ee46966e95629846d5f448ef9ca02fc23453 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -443,13 +443,18 @@ sed '
 ' po/Makevars.template >po/Makevars
 
 if test -d runtime-po; then
 ' po/Makevars.template >po/Makevars
 
 if test -d runtime-po; then

-  # Likewise for runtime-po/Makevars, except also change a few other parameters.
+  # Similarly for runtime-po/Makevars, but not quite the same.

   rm -f runtime-po/Makevars
   sed '
   rm -f runtime-po/Makevars
   sed '

-    s/^\(DOMAIN\) *=.*/\1 = '"$package"'-runtime/
-    s/^\(subdir\) *=.*/\1 = runtime-po/
-    s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = '"$XGETTEXT_OPTIONS_RUNTIME"'/
-  ' <po/Makevars >runtime-po/Makevars
+    /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+    /^subdir *=.*/s/=.*/= runtime-po/
+    /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+    /^XGETTEXT_OPTIONS *=/{
+      s/$/ \\/
+      a\
+         '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+    }
+  ' <po/Makevars.template >runtime-po/Makevars

 
   # Copy identical files from po to runtime-po.
   (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
 
   # Copy identical files from po to runtime-po.
   (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)

diff --git a/bootstrap.conf b/bootstrap.conf
index f4b02b1c7fb5485314504d7f8b8d52a89c482464..aff3c023af62303b83cc69f077c8a36ef59578e2 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -40,6 +40,9 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=warn:1:c-format  --flag=warn_at:2:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '
  --flag=warn:1:c-format  --flag=warn_at:2:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '

+XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
+ --keyword=YY_ \\\
+'

 
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.
 
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 52f9d4887f144d3942f6cf9c89bedb4334429262..d39ca4c7cf4b7a26570033d07bca1b93dd605c4d 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,11 +3,13 @@ src/conflicts.c
 src/files.c
 src/getargs.c
 src/gram.c
 src/files.c
 src/getargs.c
 src/gram.c

+src/location.c

 src/main.c
 src/parse-gram.y
 src/print.c
 src/reader.c
 src/reduce.c
 src/main.c
 src/parse-gram.y
 src/print.c
 src/reader.c
 src/reduce.c

+src/scan-code.l

 src/scan-gram.l
 src/symlist.c
 src/symtab.c
 src/scan-gram.l
 src/symlist.c
 src/symtab.c

diff --git a/runtime-po/POTFILES.in b/runtime-po/POTFILES.in
index 7e73063399e46aa0d21439564a0247e823fcb0f6..745d2c1ae2295ea0a9b961f052e28edf3368490e 100644 (file)
--- a/runtime-po/POTFILES.in
+++ b/runtime-po/POTFILES.in
@@ -1,3 +1,4 @@
 data/glr.c
 data/lalr1.cc
 data/glr.c
 data/lalr1.cc

+data/push.c

 data/yacc.c
 data/yacc.c