diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-21 20:38:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-21 20:38:28 +0200 |
| commit | 7fe875583bb474d03d281ca59af3320e7e176953 (patch) | |
| tree | 6500a824114c20a051a85e4d19727f65548412e0 | |
| parent | f5433fbfe4324fd443664fb924116b5ed675bef5 (diff) | |
patch 8.2.1032: error message for declaring a variable cannot be translatedv8.2.1032
Problem: Error message for declaring a variable cannot be translated.
Solution: Enclose in _(). Make environment variable a separate message.
| -rw-r--r-- | src/globals.h | 3 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 13 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/globals.h b/src/globals.h index 5dc139eebb..a8ff50cc47 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1788,7 +1788,8 @@ EXTERN char e_no_white_before[] INIT(= N_("E1068: No white space allowed before EXTERN char e_lock_unlock[] INIT(= N_("E940: Cannot lock or unlock variable %s")); EXTERN char e_const_req_value[] INIT(= N_("E1021: const requires a value")); EXTERN char e_type_req[] INIT(= N_("E1022: type or initialization required")); -EXTERN char e_declare_var[] INIT(= N_("E1016: Cannot declare a%s variable: %s")); +EXTERN char e_declare_var[] INIT(= N_("E1016: Cannot declare a %s variable: %s")); +EXTERN char e_declare_env_var[] INIT(= N_("E1016: Cannot declare an environment variable: %s")); #endif #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) EXTERN char e_alloc_color[] INIT(= N_("E254: Cannot allocate color %s")); diff --git a/src/version.c b/src/version.c index bfcd95d6c4..5463b44c00 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1032, +/**/ 1031, /**/ 1030, diff --git a/src/vim9compile.c b/src/vim9compile.c index 871e70736f..52ca9e219b 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4679,12 +4679,13 @@ vim9_declare_error(char_u *name) switch (*name) { - case 'g': scope = " global"; break; - case 'b': scope = " buffer"; break; - case 'w': scope = " window"; break; - case 't': scope = " tab"; break; - case 'v': scope = " v:"; break; - case '$': scope = "n environment"; break; + case 'g': scope = _("global"); break; + case 'b': scope = _("buffer"); break; + case 'w': scope = _("window"); break; + case 't': scope = _("tab"); break; + case 'v': scope = "v:"; break; + case '$': semsg(_(e_declare_env_var), name); return; + default: return; } semsg(_(e_declare_var), scope, name); } |