aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-05-08 08:26:00 +0800
committerGitHub <noreply@github.com>2023-05-08 08:26:00 +0800
commite64db1d284f0b89672f1ccf89018a88a63865cd6 (patch)
treeedd9d9422910b5a68c1a9d2995166b6a1ea6e808 /src
parent13e7e4e67ada0cd359977ca1f56ef9d8ce8c938c (diff)
downloadrneovim-e64db1d284f0b89672f1ccf89018a88a63865cd6.tar.gz
rneovim-e64db1d284f0b89672f1ccf89018a88a63865cd6.tar.bz2
rneovim-e64db1d284f0b89672f1ccf89018a88a63865cd6.zip
vim-patch:9.0.1523: some error messages are not marked for translation (#23529)
Problem: Some error messages are not marked for translation. Solution: Surround the messages in _(). (closes vim/vim#12356) https://github.com/vim/vim/commit/276410e78f0b82e3123059383994d2f4c578dfbd
Diffstat (limited to 'src')
-rw-r--r--src/nvim/globals.h3
-rw-r--r--src/nvim/menu.c4
-rw-r--r--src/nvim/popupmenu.c2
-rw-r--r--src/nvim/runtime.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 6eae2f7589..bedb529d04 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -993,7 +993,8 @@ EXTERN const char e_notset[] INIT(= N_("E764: Option '%s' is not set"));
EXTERN const char e_invalidreg[] INIT(= N_("E850: Invalid register name"));
EXTERN const char e_dirnotf[] INIT(= N_("E919: Directory not found in '%s': \"%s\""));
EXTERN const char e_au_recursive[] INIT(= N_("E952: Autocommand caused recursive behavior"));
-EXTERN const char e_menuothermode[] INIT(= N_("E328: Menu only exists in another mode"));
+EXTERN const char e_menu_only_exists_in_another_mode[]
+INIT(= N_("E328: Menu only exists in another mode"));
EXTERN const char e_autocmd_close[] INIT(= N_("E813: Cannot close autocmd window"));
EXTERN const char e_listarg[] INIT(= N_("E686: Argument of %s must be a List"));
EXTERN const char e_unsupportedoption[] INIT(= N_("E519: Option not supported"));
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index 16fea2ccf1..898e3ddd27 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -559,7 +559,7 @@ static int remove_menu(vimmenu_T **menup, char *name, int modes, bool silent)
}
} else if (*name != NUL) {
if (!silent) {
- emsg(_(e_menuothermode));
+ emsg(_(e_menu_only_exists_in_another_mode));
}
return FAIL;
}
@@ -760,7 +760,7 @@ static vimmenu_T *find_menu(vimmenu_T *menu, char *name, int modes)
emsg(_(e_notsubmenu));
return NULL;
} else if ((menu->modes & modes) == 0x0) {
- emsg(_(e_menuothermode));
+ emsg(_(e_menu_only_exists_in_another_mode));
return NULL;
} else if (*p == NUL) { // found a full match
return menu;
diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c
index d404aa9647..6d5d063a75 100644
--- a/src/nvim/popupmenu.c
+++ b/src/nvim/popupmenu.c
@@ -1083,7 +1083,7 @@ void pum_show_popupmenu(vimmenu_T *menu)
// When there are only Terminal mode menus, using "popup Edit" results in
// pum_size being zero.
if (pum_size <= 0) {
- emsg(e_menuothermode);
+ emsg(_(e_menu_only_exists_in_another_mode));
return;
}
diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c
index b4a23d544e..34e94d6021 100644
--- a/src/nvim/runtime.c
+++ b/src/nvim/runtime.c
@@ -2409,7 +2409,7 @@ void f_getscriptinfo(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
return;
}
if (sid <= 0) {
- semsg(e_invargNval, "sid", tv_get_string(&sid_di->di_tv));
+ semsg(_(e_invargNval), "sid", tv_get_string(&sid_di->di_tv));
return;
}
} else {