From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Git List" <git@vger.kernel.org>,
"Jean-Noël Avila" <jn.avila@free.fr>
Subject: Re: [PATCH] PRItime: wrap PRItime for better l10n compatibility
Date: Sat, 22 Jul 2017 08:43:18 +0800 [thread overview]
Message-ID: <CANYiYbGkuGNNYn4OF5w=1+Pqn9hEHWcD+DYVB6AXRs0vFEsY2Q@mail.gmail.com> (raw)
In-Reply-To: <xmqqr2x9fjpi.fsf@gitster.mtv.corp.google.com>
2017-07-22 7:34 GMT+08:00 Junio C Hamano <gitster@pobox.com>:
> Jiang Xin <worldhello.net@gmail.com> writes:
>
>> A very small hack on gettext. When extract l10n messages to pot file
>> with `xgettext`, will grep "PRItime", and do "sed s/PRItime/PRIuMAX"
>> inside `xgettext`.
>>
>> See this patch:
>> https://github.com/jiangxin/gettext/commit/b0a726431c93b5a1ca0fe749de376b0752e75fb0
>> ...
>> gettext-tools/src/x-c.c | 17 ++++++++++++++++-
>> gettext-tools/src/xgettext.c | 2 +-
>> 2 files changed, 17 insertions(+), 2 deletions(-)
>
> I do not think the size of the "hack" is much of an issue. There is
> no way you can sell this patch to the upstream, which would mean
> that we would have to be relying on our own private edition of the
> external tool, and that is what I feel very uncomfortable about.
I never think about that, and I won't sell it to the upstream. ;)
> You are not passing %<PRItime> through the toolchain and instead
> turning it into %<PRIuMAX>, which is less risky than the obvious
> alternative, but when we switch to a signed timestamp_t type and
> need to change it something else (e.g. PRIdMAX), you'd need to make
> sure you update that private edition that matches the source being
> compiled.
That's why I grep "PRItime to PRIuMAX" from `xgettext --version`.
When we need something else, we can tweak the "check-xgettext" task
again in Makefile, to match with a grep-"PRItime to PRIdMAX" version
of `xgettext`.
> You might even be asked to do the po/git.pot thing for
> both 'maint' and 'master' at the same time, when the former still
> uses unsigned timestamp_t while the latter switched to signed one,
> which would mean you'd need two hacked versions of gettext handy and
> choose the "right" one.
But it is rare to maintain po/git.pot file for 'maint' branch. And if
I need, I will switch to a different version of gettext. Makefile
will throw a error message, if I use a wrong version of gettext.
> Compared to that, Dscho's "hack" at least ties what PRItime is
> replaced with and what the source code says by being in the
> Makefile, which is tracked alongside the rest of the source. So I
> somehow feel that the approach has smaller chance of going wrong.
Benefit of using the tweak version of gettext:
1. `make pot` can be run in a tar extract directory (without git controlled).
2. do not need to run `git reset --hard`.
3. it's quick (nobody cares).
--
Jiang Xin
next prev parent reply other threads:[~2017-07-22 0:43 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-15 5:06 [L10N] Kickoff of translation for Git 2.14.0 round 1 Jiang Xin
2017-07-15 19:30 ` Jean-Noël Avila
2017-07-17 0:56 ` Jiang Xin
2017-07-17 16:06 ` Johannes Schindelin
2017-07-18 1:28 ` Jiang Xin
2017-07-17 15:23 ` [PATCH] PRItime: wrap PRItime for better l10n compatibility Jiang Xin
2017-07-17 17:10 ` Junio C Hamano
2017-07-18 1:33 ` Jiang Xin
2017-07-18 17:35 ` Junio C Hamano
2017-07-19 0:57 ` Jiang Xin
2017-07-19 13:25 ` Johannes Schindelin
2017-07-19 21:32 ` Junio C Hamano
2017-07-19 23:03 ` Junio C Hamano
2017-07-20 18:19 ` Junio C Hamano
2017-07-20 18:24 ` Junio C Hamano
2017-07-20 18:57 ` Junio C Hamano
2017-07-21 14:38 ` Jean-Noël Avila
2017-07-21 14:54 ` Junio C Hamano
2017-07-22 11:21 ` Johannes Schindelin
2017-07-22 15:53 ` Junio C Hamano
2017-07-25 10:20 ` Johannes Schindelin
2017-07-25 20:46 ` Junio C Hamano
2017-07-21 22:17 ` Jiang Xin
2017-07-21 22:40 ` Junio C Hamano
2017-07-21 23:13 ` Jiang Xin
2017-07-21 23:34 ` Junio C Hamano
2017-07-22 0:43 ` Jiang Xin [this message]
2017-07-22 0:52 ` [PATCH] Makefile: generate pot file using a tweaked version of xgettext Jiang Xin
2017-07-22 2:44 ` [PATCH] PRItime: wrap PRItime for better l10n compatibility Junio C Hamano
2017-07-22 11:28 ` Johannes Schindelin
2017-07-22 15:48 ` Junio C Hamano
2017-07-24 1:50 ` Jiang Xin
2017-07-25 10:22 ` Johannes Schindelin
2017-07-25 20:49 ` Junio C Hamano
2017-07-24 1:38 ` Jiang Xin
2017-07-24 19:09 ` Junio C Hamano
2017-07-25 10:25 ` Johannes Schindelin
2017-07-23 2:33 ` Jean-Noël AVILA
2017-07-23 21:54 ` Junio C Hamano
2017-07-24 2:02 ` Jiang Xin
2017-07-24 19:10 ` Junio C Hamano
2017-07-22 17:02 ` [L10N] Kickoff of translation for Git 2.14.0 round 1 Kaartic Sivaraam
2017-07-23 2:43 ` Jean-Noël Avila
2017-07-19 5:44 ` Jordi Mas
2017-07-20 0:50 ` Jiang Xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANYiYbGkuGNNYn4OF5w=1+Pqn9hEHWcD+DYVB6AXRs0vFEsY2Q@mail.gmail.com' \
--to=worldhello.net@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jn.avila@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).