Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 1, 2016, 18:15 UTC
- Message-ID
- <xmqqr393wkof.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1472718808.4680.19.camel@kaarsemaker.net>
Dennis Kaarsemaker <dennis@kaarsemaker.net> writes:
Show 31 quoted lines
>> +static const char *nth_for_number(int n)
>> +{
>> + int n1 = n % 10, n10 = n % 100;
>> +
>> + if (n1 == 1 && n10 != 11)
>> + return "st";
>> + if (n1 == 2 && n10 != 12)
>> + return "nd";
>> + if (n1 == 3 && n10 != 13)
>> + return "rd";
>> + return "th";
>> +}
>
>>8---
>
>> + if (command == TODO_SQUASH) {
>> + unlink(rebase_path_fixup_msg());
>> + strbuf_addf(&buf, "\n%c This is the %d%s commit message:\n\n%s",
>> + comment_line_char,
>> + count, nth_for_number(count), body);
>> + }
>> + else if (command == TODO_FIXUP) {
>> + strbuf_addf(&buf,
>> + "\n%c The %d%s commit message will be skipped:\n\n",
>> + comment_line_char, count, nth_for_number(count));
>> + strbuf_add_commented_lines(&buf, body, strlen(body));
>> + }
>
> This way of handling numbers is not translatable, and I really think we
> should mark these strings for translation, like they are in the .sh
> version.Correct.
For those who were not paying attention on the 'master' front during this pre-release period [*1*], I have to point out that the scripted Porcelain has been updated to lose the Anglo-centric st/nd/rd/th and this series would want to get updated to match.
[Footnote]
*1* Why weren't you? Repent! ;-)