Re: [PATCH] status: display the SHA1 of the commit being currently processed
Le 2013-06-17 15:10, Peter Krefting a écrit :
Show 28 quoted lines
> Mathieu Lienard--Mayor:
>
>> + /*
>> + * If the file stopped-sha does not exist
>> + * we go back to the old output saying "a commit"
>> + * instead of providing the commit's SHA1.
>> + */
>> + if (!stopped_sha) {
>> + stopped_sha = "a commit";
>> + must_free_stopped_sha = 0;
>> + }
>
> This is missing gettext markers, and besides that, it very difficult
> to handle for translators. Please consider changing the code to use
> different strings based on what you want to insert, i.e.:
>
>> if (state->branch)
>> status_printf_ln(s, color,
>> - _("You are currently splitting a commit while rebasing branch
>> '%s' on '%s'."),
>> + _("Splitting %s while rebasing branch '%s' on '%s'."),
>
> stopped_sha ? _("Splitting %s while rebasing branch '%s' on
> '%s'.")
> : _("Splitting a commit while rebasing branch '%2$s'
> on '%3$s'.")
>
> or something similar.Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_("Splitting %s while rebasing branch '%s' on '%s'."),
stopped_sha ? stopped_sha : _("a commit"),
....);Would this be more suitable for translators ?
--
Mathieu Liénard--Mayor,
2nd year at Grenoble INP - ENSIMAG
(+33)6 80 56 30 02