thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1032: error message for declaring a variable cannot be translated

Browse Source 
Problem:    Error message for declaring a variable cannot be translated.
Solution:   Enclose in _().  Make environment variable a separate message.
This commit is contained in:
Bram Moolenaar
2020-06-21 20:38:28 +02:00
parent f5433fbfe4
commit 7fe875583b
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/globals.h
View File

@@ -1789,6 +1789,7 @@ 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_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"));

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1032,
/**/
1031,
/**/

11
src/vim9compile.c
View File

@@ -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 '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 '$': semsg(_(e_declare_env_var), name); return;
default: return;
}
semsg(_(e_declare_var), scope, name);
}