Jean-Noël AVILA <jn.av...@free.fr> writes:
> Le dimanche 30 avril 2017, 18:45:05 CEST Junio C Hamano a écrit :
>> Jean-Noel Avila <jn.av...@free.fr> writes:
>> > The building of the reflog message is using strbuf, which is not
>> > friendly with internationalization frameworks. No other reflog
>> > messages are translated right now and switching all the messages to
>> > i18n would require a major rework of the way the messages are built.
>>
>> Thanks for spotting. Before we declare that reflog messages are for
>> i18n, we'd need to either drop (or redesign the implementation of)
>> the "checkout -" feature, which relies on the exact phrasing of how
>> reflog entries from "git checkout" looks like.
>>
>> Will queue and merge down to 'master' quickly.
>>
>
> I didn't know this "side effect". Maybe adding a test against it would be
> requiered. Unfortunately, I don't know enough of it.
Sorry, but I am not sure what "side effect" you are referring to. I
am saying that in the current codebase not translating tag reflog
message (i.e. your fix) is the right thing to do.
builtin/checkout.c does
strbuf_addf(&msg, "checkout: moving from %s to %s",
old_desc ? old_desc : "(invalid)", new->name);
when "git checkout" is used to switch from old to new branch. The
above phrasing is used by sha1_name.c::grab_nth_branch_switch() to
know what branch you were on, and not having _() around the message
is the right thing to do, at least in the current codebase.
If somebody wants to i18n the reflog message, that needs to be done
at the reading/dispaying end, I would think. Instead of being purely
textual records, a new reflog format would have to be a machine
parsable message-id with parameters, and the code that wants to
understand the reflog record like grab_nth_branch_switch(), as
opposed to show the record to the humans, would just use the machine
parsable raw data, while "git reflog" and friends that format the
reflog record would give the message-id to gettext and feed the
parameters recorded using the result of gettext() as the format
string to fprintf(), or something like that.
That would solve the issue in multi-user repository Ævar raised,
too. You'd see Chinese reflog entry not because the person who did
the operation that created the reflog entry were writing Chinese,
but because your locale is set to show Chinese when you tried to
read the reflog. German users would see the reflog entry that
records what the Chinese developer did in German if we follow that
route.
