Patch 9.0.0004

[Bram Moolenaar]

Patch 9.0.0004
Problem: Plural messages not translated properly.
Solution: Use ngettext() in a few more places. (Matvey Tarasov,
closes #10606)
Files: src/vim9execute.c


*** ../vim-9.0.0003/src/vim9execute.c 2022-05-22 22:03:26.000000000 +0100
--- src/vim9execute.c 2022-06-29 13:03:56.103813997 +0100
***************
*** 478,497 ****
arg_to_add = ufunc->uf_args.ga_len - argcount;
if (arg_to_add < 0)
{
! if (arg_to_add == -1)
! emsg(_(e_one_argument_too_many));
! else
! semsg(_(e_nr_arguments_too_many), -arg_to_add);
return FAIL;
}
else if (arg_to_add > ufunc->uf_def_args.ga_len)
{
int missing = arg_to_add - ufunc->uf_def_args.ga_len;

! if (missing == 1)
! emsg(_(e_one_argument_too_few));
! else
! semsg(_(e_nr_arguments_too_few), missing);
return FAIL;
}

--- 478,493 ----
arg_to_add = ufunc->uf_args.ga_len - argcount;
if (arg_to_add < 0)
{
! semsg(NGETTEXT(e_one_argument_too_many, e_nr_arguments_too_many,
! -arg_to_add), -arg_to_add);
return FAIL;
}
else if (arg_to_add > ufunc->uf_def_args.ga_len)
{
int missing = arg_to_add - ufunc->uf_def_args.ga_len;

! semsg(NGETTEXT(e_one_argument_too_few, e_nr_arguments_too_few,
! missing), missing);
return FAIL;
}

***************
*** 5170,5188 ****
idx = argc - ufunc->uf_args.ga_len;
if (idx > 0 && ufunc->uf_va_name == NULL)
{
! if (idx == 1)
! emsg(_(e_one_argument_too_many));
! else
! semsg(_(e_nr_arguments_too_many), idx);
goto failed_early;
}
idx = argc - ufunc->uf_args.ga_len + ufunc->uf_def_args.ga_len;
if (idx < 0)
{
! if (idx == -1)
! emsg(_(e_one_argument_too_few));
! else
! semsg(_(e_nr_arguments_too_few), -idx);
goto failed_early;
}

--- 5166,5180 ----
idx = argc - ufunc->uf_args.ga_len;
if (idx > 0 && ufunc->uf_va_name == NULL)
{
! semsg(NGETTEXT(e_one_argument_too_many, e_nr_arguments_too_many,
! idx), idx);
goto failed_early;
}
idx = argc - ufunc->uf_args.ga_len + ufunc->uf_def_args.ga_len;
if (idx < 0)
{
! semsg(NGETTEXT(e_one_argument_too_few, e_nr_arguments_too_few,
! -idx), -idx);
goto failed_early;
}

*** ../vim-9.0.0003/src/version.c 2022-06-29 12:54:48.068572061 +0100
--- src/version.c 2022-06-29 13:18:02.130603387 +0100
***************
*** 737,738 ****
--- 737,740 ----
{ /* Add new patch number below this line */
+ /**/
+ 4,
/**/

--
How To Keep A Healthy Level Of Insanity:
9. As often as possible, skip rather than walk.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///