Re: [PATCH 00/20] [CONTINUE] Add gettext support to Git

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sep 10, 2010, 17:17 UTC
Message-ID: <AANLkTikdHZFmXAdABvS9hPXtbXNJU5NdCOrw5_KP73bX@mail.gmail.com>
In-Reply-To: <7vaanpio4n.fsf@alter.siamese.dyndns.org>

On Fri, Sep 10, 2010 at 16:01, Junio C Hamano <gitster@pobox.com> wrote:

Show 17 quoted lines

> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> Hi, since you didn't pick this up in the last push I fixed it up a bit
>> more.
>>
>> I rebased ab/i18n-all-continue on the new master:
>>
>>     git fetch git://github.com/avar/git +ab/i18n-all-continue:ab/i18n
>>
>> But you probably want this instead:
>>
>>     git fetch git://github.com/avar/git +ab/i18n-all-continue-with-hindi:ab/i18n
>>
>> I took the liberty of adding Ramkumar Ramachandra's hi.po patch to the
>> series.
>
> I think that the latter is "i18n-continue-with-hindi" (no "all")

Yes, sorry. It's just "ab/i18n-continue-with-hindi".

> and also suspect that ab/i18n-all-continue either hasn't be pushed
> out or is stale?

Yes sorry, I pushed to "ab/i18n-continue" instead. "ab/i18n-all-continue" is now up-to-date (equivalent to "ab/i18n-continue"). Sorry abuot the mixup.

> The copy of "all-continue" I just fetched ends with 2b5170f (gettextize:
> git-shortlog basic messages, 2010-09-05) while hindi^ is at c4adf2e
> (gettextize: git-am printf(1) message to eval_gettext, 2010-09-07).

The hindi^ one was the right tip.

Show 5 quoted lines

> I haven't formed an opinion as to what to do with the *.po files after the
> series hits 'next' (or anything more stable than 'pu'); my preference is
> to delegate that part of the system to somebody who volunteers as an i18n
> coordinator, and pull from him/her from time to time, just like the way
> gitk and git-gui are managed.

We could certainly set up something like that. I going to wait and see if we needed it before proposing such a thing.

After an initial spur of translation submissions po/ will probably quiet down quickly. We aren't adding new strings that often, so updating translations shouldn't represent much PATCH traffic on-list.

But it could be split up if that's preferred too.

Show 8 quoted lines

> For now, I'll queue the whole thing and merge that to 'pu', but we would
> want to squash l10n commits after (but not including) 8d65a35 (gettext
> tests: test re-encoding with a UTF-8 msgid under Shell, 2010-08-30) that
> touch only one file in po/*.po into one commit per language, move them
> near the tip after all the infrastructure enhancements (and fix-ups to the
> infrastructure, if necessary) and individual command i18ns, to make the
> end result a reasonably complete and clean "first cut for public testing"
> of the series before it hits 'next'.

I can move those around, I didn't do so already because their position in the series is semantically meaningful. I.e. at the time is.po is added it's pretty much a 100% translation, but more strings are added after that.

That's a trivial minor issue with msgmerge and msgfmt --statistics to find out how much is translated though. So I've re-arranged them and squashed 'em for you here:

    git://github.com/avar/git.git ab/i18n-for-junio

> As a companion update to 6495411 (gettext docs: add po/README file
> documenting Git's gettext, 2010-09-03), we would need a file in
> Documentation/ directory to describe the use of _() and N_() for
> programmers and point it from CodingGuidelines.

I can add that to ab/i18n-for-junio, but haven't already. Isn't it better if I send that to the list for review instead of just tucking something at the end of the series. I can do either.

> We might also want to move po/README to Documentation/ but I don't
> have strong preference either way.

I'd like to make it a manpage (as mentioned before), but i can't figure out a good git-*.txt name for it.