Às 19:28 de 18-05-2016, Eric Sunshine escreveu:
> On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida <vascomalmeida@xxxxxxx> wrote:
>> Mark entire sentences of error message rather than assembling one using
>> placeholders (e.g. "Cannot %s during a %s"). That would facilitate
>> translation work.
>>
>> Signed-off-by: Vasco Almeida <vascomalmeida@xxxxxxx>
>> ---
>> diff --git a/sequencer.c b/sequencer.c
>> @@ -697,9 +697,14 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
>> if (action != opts->action) {
>> - const char *action_str;
>> - action_str = action == REPLAY_REVERT ? "revert" : "cherry-pick";
>> - error(_("Cannot %s during a %s"), action_str, action_name(opts));
>> + if (action == REPLAY_REVERT)
>> + error((opts->action == REPLAY_REVERT)
>> + ? _("Cannot revert during a another revert.")
>> + : _("Cannot revert during a cherry-pick."));
>> + else
>> + error((opts->action == REPLAY_REVERT)
>> + ? _("Cannot cherry-pick during a revert.")
>> + : _("Cannot cherry-pick during another cherry-pick."));
>> return NULL;
>> }
>
> Similar to my comment on patch 3/21, since the "actions" are literal
> git commands, it's not clear why this change is helpful. Perhaps the
> commit message needs to do a better job of persuading the reader?
>
I agree, I should have explained why this way. As I tried to explain on
patch 3/21, it concerns a) we can't assume what and how does the
translator translates into her language, so b) give translations freedom
to choose.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html