mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

msgexec: Pass previous msgid to the child process

Browse Source 
Suggested by Pavel Kharitonov in:
<http://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00022.html>.
* msgexec.c (process_string): Set MSGEXEC_PREV_* envvar.
This commit is contained in:
Daiki Ueno 2014-05-31 15:44:17 +09:00
parent 3a78eca9e7
commit 108bf80c79
6 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gettext-tools/doc/ChangeLog
View File

@ -1,3 +1,9 @@
2014-05-31 Daiki Ueno <ueno@gnu.org>
* msgexec.texi: Document the environment variable
MSGEXEC_PREV_MSGCTXT, MSGEXEC_PREV_MSGID, and
MSGEXEC_PREV_MSGID_PLURAL.
2014-05-31 Daiki Ueno <ueno@gnu.org>
* msgfilter.texi: Document the environment variable

8
gettext-tools/doc/msgexec.texi
View File

@ -22,6 +22,9 @@ by a null byte. The output of @samp{msgexec 0} is suitable as input for
@vindex MSGEXEC_MSGID_PLURAL@r{, environment variable}
@vindex MSGEXEC_LOCATION@r{, environment variable}
@vindex MSGEXEC_PLURAL_FORM@r{, environment variable}
@vindex MSGEXEC_PREV_MSGCTXT@r{, environment variable}
@vindex MSGEXEC_PREV_MSGID@r{, environment variable}
@vindex MSGEXEC_PREV_MSGID_PLURAL@r{, environment variable}
During each @var{command} invocation, the environment variable
@code{MSGEXEC_MSGID} is bound to the message's msgid, and the environment
variable @code{MSGEXEC_LOCATION} is bound to the location in the PO file
@ -31,6 +34,11 @@ unbound. If the message has a plural form, environment variable
@code{MSGEXEC_MSGID_PLURAL} is bound to the message's msgid_plural and
@code{MSGEXEC_PLURAL_FORM} is bound to the order number of the plural
actually processed (starting with 0), otherwise both are unbound.
If the message has a previous msgid (added by @code{msgmerge}),
environment variable @code{MSGEXEC_PREV_MSGCTXT} is bound to the
message's previous msgctxt, @code{MSGEXEC_PREV_MSGID} is bound to
the previous msgid, and @code{MSGEXEC_PREV_MSGID_PLURAL} is bound to
the previous msgid_plural.
@cindex catalog encoding and @code{msgexec} output
Note: It is your responsibility to ensure that the @var{command} can cope

7
gettext-tools/src/ChangeLog
View File

@ -1,3 +1,10 @@
2014-05-31 Daiki Ueno <ueno@gnu.org>
msgexec: Pass previous msgid to the child process
Suggested by Pavel Kharitonov in:
<http://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00022.html>.
* msgexec.c (process_string): Set MSGEXEC_PREV_* envvar.
2014-05-31 Daiki Ueno <ueno@gnu.org>
msgfilter: Pass previous msgid to the child process

12
gettext-tools/src/msgexec.c
View File

@ -378,6 +378,18 @@ process_string (const message_ty *mp, const char *str, size_t len)
(long) mp->pos.line_number);
xsetenv ("MSGEXEC_LOCATION", location, 1);
free (location);
if (mp->prev_msgctxt != NULL)
xsetenv ("MSGEXEC_PREV_MSGCTXT", mp->prev_msgctxt, 1);
else
unsetenv ("MSGEXEC_PREV_MSGCTXT");
if (mp->prev_msgid != NULL)
xsetenv ("MSGEXEC_PREV_MSGID", mp->prev_msgid, 1);
else
unsetenv ("MSGEXEC_PREV_MSGID");
if (mp->prev_msgid_plural != NULL)
xsetenv ("MSGEXEC_PREV_MSGID_PLURAL", mp->prev_msgid_plural, 1);
else
unsetenv ("MSGEXEC_PREV_MSGID_PLURAL");
/* Open a pipe to a subprocess. */
child = create_pipe_out (sub_name, sub_path, sub_argv, NULL, false, true,

4
gettext-tools/tests/ChangeLog
View File

@ -1,3 +1,7 @@
2014-05-31 Daiki Ueno <ueno@gnu.org>
* msgexec-5: Test MSGEXEC_PREV_MSGID and MSGEXEC_PREV_MSGID_PLURAL.
2014-05-31 Daiki Ueno <ueno@gnu.org>
* msgfilter-6: Test MSGFILTER_PREV_MSGID and

20
gettext-tools/tests/msgexec-5
View File

@ -15,6 +15,8 @@ msgstr "'Votre commande, s'il vous plait', dit le garcon."
# Les gateaux allemands sont les meilleurs du monde.
#, c-format
#| msgid "a piece of bread"
#| msgid_plural "%d pieces of bread"
msgid "a piece of cake"
msgid_plural "%d pieces of cake"
msgstr[0] "un morceau de gateau"
@ -36,6 +38,8 @@ cat <<MEOF
$MSGEXEC_MSGID
$MSGEXEC_MSGID_PLURAL
$MSGEXEC_PLURAL_FORM
$MSGEXEC_PREV_MSGID
$MSGEXEC_PREV_MSGID_PLURAL
---
MEOF
cat
@ -56,6 +60,8 @@ cat <<\EOF > mex-test5.ok
---
Content-Type: text/plain; charset=ASCII
Plural-Forms: nplurals=2; plural=(n > 1);
@ -64,24 +70,32 @@ Plural-Forms: nplurals=2; plural=(n > 1);
'Your command, please?', asked the waiter.
---
'Votre commande, s'il vous plait', dit le garcon.
========================= mex-test5.po:14 =========================
========================= mex-test5.po:16 =========================
a piece of cake
%d pieces of cake
0
a piece of bread
%d pieces of bread
---
un morceau de gateau
========================= mex-test5.po:14 =========================
========================= mex-test5.po:16 =========================
a piece of cake
%d pieces of cake
1
a piece of bread
%d pieces of bread
---
%d morceaux de gateau
========================= mex-test5.po:20 =========================
========================= mex-test5.po:22 =========================
%s is replaced by %s.
---
%2$s remplace %1$s.
EOF