kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sequencer: do not translate reflog messages 

Traditionally, reflog messages were never translated, in particular not
on storage.

Due to the switch of more parts of git to the sequencer, old changes in
the sequencer code may lead to recent changes in git's behaviour. E.g.:
c28cbc5ea6 ("sequencer: mark action_name() for translation", 2016-10-21)
marked several uses of `action_name()` for translation. Recently, this
lead to a partially translated reflog:

`rebase: fast-forward` is translated (e.g. in de to `Rebase: Vorspulen`)
whereas other reflog entries such as `rebase (pick):` remain
untranslated as they should be.

Change the relevant line in the sequencer so that this reflog entry
remains untranslated, as well.

Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael J Gruber 2022-08-18 15:13:26 +02:00 committed by Junio C Hamano
parent 795ea8776b
commit 5670e0ec15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sequencer.c
View File

@ -575,7 +575,7 @@ static int fast_forward_to(struct repository *r,
if (checkout_fast_forward(r, from, to, 1))
return -1; /* the callee should have complained already */

strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));
strbuf_addf(&sb, "%s: fast-forward", action_name(opts));

transaction = ref_transaction_begin(&err);
if (!transaction ||