From: Daiki Ueno Date: Wed, 8 Oct 2014 06:17:08 +0000 (+0900) Subject: po: Make it possible to pass custom options to msginit X-Git-Tag: v0.19.3~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fd79b0faac8d3382ae0e09c068249abb3ec3a8f;p=thirdparty%2Fgettext.git po: Make it possible to pass custom options to msginit * Makevars (MSGINIT_OPTIONS): New variable. * Rules-quot: Use it when invoking msginit. If one wants to use '--no-wrap' in MSGMERGE_OPTIONS and XGETTEXT_OPTIONS, there should be a way to pass the option to msginit. Reported by Ludovic Courtès in: . --- diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog index 31a69f8f0..e80051541 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog @@ -1,3 +1,12 @@ +2014-10-08 Daiki Ueno + + * Makevars (MSGINIT_OPTIONS): New variable. + * Rules-quot: Use it when invoking msginit. + If one wants to use '--no-wrap' in MSGMERGE_OPTIONS and + XGETTEXT_OPTIONS, there should be a way to pass the option to + msginit. Reported by Ludovic Courtès in: + . + 2014-07-14 Daiki Ueno * gettext 0.19.2 released. diff --git a/gettext-runtime/po/Makevars b/gettext-runtime/po/Makevars index 3b19fe406..249356a6e 100644 --- a/gettext-runtime/po/Makevars +++ b/gettext-runtime/po/Makevars @@ -62,6 +62,12 @@ USE_MSGCTXT = no # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + # This tells whether or not to regenerate a PO file when $(DOMAIN).pot # has changed. Possible values are "yes" and "no". Set this to no if # the POT file is checked in the repository and the version control diff --git a/gettext-runtime/po/Rules-quot b/gettext-runtime/po/Rules-quot index 7b92c7e45..9dc963076 100644 --- a/gettext-runtime/po/Rules-quot +++ b/gettext-runtime/po/Rules-quot @@ -21,7 +21,7 @@ en@boldquot.po-update: en@boldquot.po-update-en ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog index a43833e32..37563eba4 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -1,3 +1,8 @@ +2014-10-08 Daiki Ueno + + * Makevars (MSGINIT_OPTIONS): New variable. + * Makevars.template (MSGINIT_OPTIONS): Likewise. + 2014-07-14 Daiki Ueno * gettext 0.19.2 released. diff --git a/gettext-tools/po/Makevars b/gettext-tools/po/Makevars index 8535f183e..91fb74928 100644 --- a/gettext-tools/po/Makevars +++ b/gettext-tools/po/Makevars @@ -66,6 +66,12 @@ USE_MSGCTXT = no # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + # This tells whether or not to regenerate a PO file when $(DOMAIN).pot # has changed. Possible values are "yes" and "no". Set this to no if # the POT file is checked in the repository and the version control diff --git a/gettext-tools/po/Makevars.template b/gettext-tools/po/Makevars.template index fd76ad6ef..0648ec759 100644 --- a/gettext-tools/po/Makevars.template +++ b/gettext-tools/po/Makevars.template @@ -59,6 +59,12 @@ USE_MSGCTXT = no # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + # This tells whether or not to regenerate a PO file when $(DOMAIN).pot # has changed. Possible values are "yes" and "no". Set this to no if # the POT file is checked in the repository and the version control