mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
i18n: apply: split to fix a partial i18n message
The 4th arg of "new mode (%o) of %s does not match old mode (%o)%s%s" is blank string or string " of ". Even mark the string " of " for a complete i18n, this message is still hard to translate right. Split it into two slight different messages would make l10n teams happy. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b2478aa085
commit
f50b565a0f
|
@ -3262,10 +3262,18 @@ static int check_patch(struct patch *patch)
|
|||
int same = !strcmp(old_name, new_name);
|
||||
if (!patch->new_mode)
|
||||
patch->new_mode = patch->old_mode;
|
||||
if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
|
||||
return error(_("new mode (%o) of %s does not match old mode (%o)%s%s"),
|
||||
patch->new_mode, new_name, patch->old_mode,
|
||||
same ? "" : " of ", same ? "" : old_name);
|
||||
if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {
|
||||
if (same)
|
||||
return error(_("new mode (%o) of %s does not "
|
||||
"match old mode (%o)"),
|
||||
patch->new_mode, new_name,
|
||||
patch->old_mode);
|
||||
else
|
||||
return error(_("new mode (%o) of %s does not "
|
||||
"match old mode (%o) of %s"),
|
||||
patch->new_mode, new_name,
|
||||
patch->old_mode, old_name);
|
||||
}
|
||||
}
|
||||
|
||||
if (apply_data(patch, &st, ce) < 0)
|
||||
|
|
Loading…
Reference in a new issue