adding --no-wrap to msgmerge
PATCH 1/1 adding --no-wrap to msgmerge
Hi,
Attached is a patch that should add the option --no-wrap to the runs of msgmerge (after a renewal of the POT file) to reduce the number of spurious differences.
However, I can't get the thing to work here. When i run autogen.sh it says "Copying file po/Makefile.in.in", and when I then look in that file it mentions "# Origin: gettext-0.14". But the only Makefile.in.in I have on this testing system is /usr/share/gettext/po/Makefile.in.in and in that file it says "# Origin: gettext-0.18". (That version is needed, otherwise it doesn't know the MSGMERGE_OPTIONS variable.)
So... where does autogen.sh/autopoint take its Makefile.in.in from?
Regards,
Benno
Signature · 2 lines
http://www.fastmail.fm - Or how I learned to stop worrying and
love email againFrom 4d9a629b2d3a9e1768eb268acaf9e73fb169978f Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Mon, 16 Dec 2013 22:41:56 +0100
Subject: [PATCH] po: add '--no-wrap' to msgmerge, to not wrap long message lines
This avoids unneeded churn during POT-file renewal and PO-file updates, as the PO files at the TP are made with '--no-wrap'.
--- po/Makevars | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
po/Makevars +3 -0
@@ -10,6 +10,9 @@ top_builddir = .. # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2 +# This option gets passed to msgmerge. +MSGMERGE_OPTIONS = --no-wrap + # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding # package. (Note that the msgstr strings, extracted from the package's
Signature · 1 line
1.7.0.4
Quoted 4 lines · Benno Schulenberg
Attached is a patch that should add the option --no-wrap to the runs of msgmerge (after a renewal of the POT file) to reduce the number of spurious differences.
Quoted 8 lines
However, I can't get the thing to work here. When i run
autogen.shit says "Copying file po/Makefile.in.in", and when I then look in that file it mentions "# Origin: gettext-0.14". But the only Makefile.in.in I have on this testing system is/usr/share/gettext/po/Makefile.in.inand in that file it says "# Origin: gettext-0.18". (That version is needed, otherwise it doesn't know theMSGMERGE_OPTIONSvariable.)So... where does autogen.sh/autopoint take its Makefile.in.in from?
Hi Benno,
I think the change should include configure.ac update to require gettext version 0.18.
-- snip
configure.ac +1 -1
@@ -145,7 +145,7 @@ UL_SET_ARCH([HPPA], [hppa*]) AC_SYS_LARGEFILE -AM_GNU_GETTEXT_VERSION([0.14.1]) +AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) AS_IF([test -d "$srcdir/po"], [
-- snip
Feel free to add when resubmitting.
Signature · 2 lines
Sami Kerola http://www.iki.fi/kerolasa/
PATCH 1/1 adding --no-wrap to msgmerge
Attached an updated patch, that avoids unneeded churn in PO files in git (wrapping and subsequent unwrapping of long lines). Works for me.
Review
Quoted 5 lines · Sami Kerola
I think the change should include configure.ac update to require gettext version 0.18.
(quoted diff) +1
-1-AM_GNU_GETTEXT_VERSION([0.14.1]) +AM_GNU_GETTEXT_VERSION([0.18])
Thank you, Sami. That worked.
Although, now, during ./autogen.sh, I get the following warning:
configure.ac:149: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged. configure.ac:149: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead, configure.ac:149: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am fi
Something from gettext, apparently, because line 149 is:
AM_GNU_GETTEXT([external])
Regards,
Benno
Signature · 1 line
http://www.fastmail.fm - Email service worth paying for. Try it for free
From 4cb5d4ccd529bc5521e23b817d23295f1456e1ef Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Mon, 16 Dec 2013 22:41:56 +0100
Subject: [PATCH] po: add '--no-wrap' to msgmerge, to not wrap long message lines
This avoids unneeded churn during POT-file renewal and PO-file updates, as the PO files at the TP are made with '--no-wrap'.
--- configure.ac | 2 +- po/Makevars | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-)
configure.ac +1 -1
@@ -145,7 +145,7 @@ UL_SET_ARCH([HPPA], [hppa*]) AC_SYS_LARGEFILE -AM_GNU_GETTEXT_VERSION([0.14.1]) +AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) AS_IF([test -d "$srcdir/po"], [
po/Makevars +3 -0
@@ -10,6 +10,9 @@ top_builddir = .. # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2 +# This option gets passed to msgmerge. +MSGMERGE_OPTIONS = --no-wrap + # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding # package. (Note that the msgstr strings, extracted from the package's
Signature · 1 line
1.7.0.4
Quoted 5 lines · Benno Schulenberg
Although, now, during ./autogen.sh, I get the following warning:
configure.ac:149: warning: The '
AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged. configure.ac:149: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead, configure.ac:149: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am fi
Yes, that is coming from gettext. I have hunch the error is expected. See link below for details.
I'm sure [email protected] can make just call if the $(mkdir_p) should replaced with $(MKDIR_P), and if the gettext should attempt to find the value for the macro.
Signature · 2 lines
Sami Kerola http://www.iki.fi/kerolasa/
Quoted 3 lines
configure.ac | 2 +- po/Makevars | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-)
Applied, thanks.
Signature · 2 lines
Karel Zak <[email protected]> http://karelzak.blogspot.com