undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/setup-extensions-message-i18n-fix'

Browse Source 
Message update.

* ah/setup-extensions-message-i18n-fix:
  setup: split "extensions found" messages into singular and plural
This commit is contained in:
Junio C Hamano 2021-06-10 12:04:27 +09:00
commit ccf0378905
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup.c
View File

@ -666,7 +666,9 @@ int verify_repository_format(const struct repository_format *format,
if (format->version >= 1 && format->unknown_extensions.nr) { if (format->version >= 1 && format->unknown_extensions.nr) {
int i; int i;
strbuf_addstr(err, _("unknown repository extensions found:")); strbuf_addstr(err, Q_("unknown repository extension found:",
"unknown repository extensions found:",
format->unknown_extensions.nr));
for (i = 0; i < format->unknown_extensions.nr; i++) for (i = 0; i < format->unknown_extensions.nr; i++)
strbuf_addf(err, "\n\t%s", strbuf_addf(err, "\n\t%s",
@ -678,7 +680,9 @@ int verify_repository_format(const struct repository_format *format,
int i; int i;
strbuf_addstr(err, strbuf_addstr(err,
_("repo version is 0, but v1-only extensions found:")); Q_("repo version is 0, but v1-only extension found:",
"repo version is 0, but v1-only extensions found:",
format->v1_only_extensions.nr));
for (i = 0; i < format->v1_only_extensions.nr; i++) for (i = 0; i < format->v1_only_extensions.nr; i++)
strbuf_addf(err, "\n\t%s", strbuf_addf(err, "\n\t%s",