From d14bb1aef9a142f403aa16298c23db2751de9391 Mon Sep 17 00:00:00 2001 From: Matvey Tarasov Date: Wed, 29 Jun 2022 13:18:27 +0100 Subject: patch 9.0.0004: plural messages not translated properly Problem: Plural messages not translated properly. Solution: Use ngettext() in a few more places. (Matvey Tarasov, closes #10606) --- src/version.c | 2 ++ src/vim9execute.c | 24 ++++++++---------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/version.c b/src/version.c index 2faf3bdfc..dd99f8575 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4, /**/ 3, /**/ diff --git a/src/vim9execute.c b/src/vim9execute.c index 217a97797..9dd5937e4 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -478,20 +478,16 @@ call_dfunc( 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); + 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; - if (missing == 1) - emsg(_(e_one_argument_too_few)); - else - semsg(_(e_nr_arguments_too_few), missing); + semsg(NGETTEXT(e_one_argument_too_few, e_nr_arguments_too_few, + missing), missing); return FAIL; } @@ -5170,19 +5166,15 @@ call_def_function( 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); + 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) { - if (idx == -1) - emsg(_(e_one_argument_too_few)); - else - semsg(_(e_nr_arguments_too_few), -idx); + semsg(NGETTEXT(e_one_argument_too_few, e_nr_arguments_too_few, + -idx), -idx); goto failed_early; } -- cgit v1.2.1