[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bootstrap and translation fixes
From: |
Paul Eggert |
Subject: |
bootstrap and translation fixes |
Date: |
Sun, 01 Oct 2006 16:37:13 -0700 |
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) |
I noticed that Bison's translation mechanism was slightly broken
by the latest bootstrap change, and that some files were missing
from the list of files containing messages to be translated.
I installed this:
2006-10-01 Paul Eggert <address@hidden>
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.
Index: bootstrap
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap,v
retrieving revision 1.44
diff -p -u -r1.44 bootstrap
--- bootstrap 30 Sep 2006 05:21:35 -0000 1.44
+++ bootstrap 1 Oct 2006 23:34:47 -0000
@@ -443,13 +443,18 @@ sed '
' 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 '
- 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)
Index: bootstrap.conf
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap.conf,v
retrieving revision 1.1
diff -p -u -r1.1 bootstrap.conf
--- bootstrap.conf 15 Sep 2006 18:59:40 -0000 1.1
+++ bootstrap.conf 1 Oct 2006 23:34:47 -0000
@@ -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\\\
'
+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.
Index: po/POTFILES.in
===================================================================
RCS file: /cvsroot/bison/bison/po/POTFILES.in,v
retrieving revision 1.22
diff -p -u -r1.22 POTFILES.in
--- po/POTFILES.in 22 Jul 2005 21:44:03 -0000 1.22
+++ po/POTFILES.in 1 Oct 2006 23:34:47 -0000
@@ -3,11 +3,13 @@ src/conflicts.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/scan-code.l
src/scan-gram.l
src/symlist.c
src/symtab.c
Index: runtime-po/POTFILES.in
===================================================================
RCS file: /cvsroot/bison/bison/runtime-po/POTFILES.in,v
retrieving revision 1.2
diff -p -u -r1.2 POTFILES.in
--- runtime-po/POTFILES.in 18 Jul 2005 22:10:15 -0000 1.2
+++ runtime-po/POTFILES.in 1 Oct 2006 23:34:47 -0000
@@ -1,3 +1,4 @@
data/glr.c
data/lalr1.cc
+data/push.c
data/yacc.c
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- bootstrap and translation fixes,
Paul Eggert <=