aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 7.4.2250

Browse Source 
Problem:    Some error message cannot be translated.
Solution:   Enclose them in _() and N_(). (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2016-08-24 22:11:55 +02:00
parent ba2099034f
commit 5b30291785
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/channel.c
View File

@@ -702,7 +702,7 @@ channel_open(
if ((host = gethostbyname(hostname)) == NULL) if ((host = gethostbyname(hostname)) == NULL)
{ {
ch_error(channel, "in gethostbyname() in channel_open()"); ch_error(channel, "in gethostbyname() in channel_open()");
PERROR("E901: gethostbyname() in channel_open()"); PERROR(_("E901: gethostbyname() in channel_open()"));
channel_free(channel); channel_free(channel);
return NULL; return NULL;
} }
@@ -729,7 +729,7 @@ channel_open(
if (sd == -1) if (sd == -1)
{ {
ch_error(channel, "in socket() in channel_open()."); ch_error(channel, "in socket() in channel_open().");
PERROR("E898: socket() in channel_open()"); PERROR(_("E898: socket() in channel_open()"));
channel_free(channel); channel_free(channel);
return NULL; return NULL;
} }
@@ -2070,7 +2070,7 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
{ {
ch_error(channel, "received command with non-string argument"); ch_error(channel, "received command with non-string argument");
if (p_verbose > 2) if (p_verbose > 2)
EMSG("E903: received command with non-string argument"); EMSG(_("E903: received command with non-string argument"));
return; return;
} }
arg = argv[1].vval.v_string; arg = argv[1].vval.v_string;
@@ -2129,13 +2129,13 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
{ {
ch_error(channel, "last argument for expr/call must be a number"); ch_error(channel, "last argument for expr/call must be a number");
if (p_verbose > 2) if (p_verbose > 2)
EMSG("E904: last argument for expr/call must be a number"); EMSG(_("E904: last argument for expr/call must be a number"));
} }
else if (is_call && argv[2].v_type != VAR_LIST) else if (is_call && argv[2].v_type != VAR_LIST)
{ {
ch_error(channel, "third argument for call must be a list"); ch_error(channel, "third argument for call must be a list");
if (p_verbose > 2) if (p_verbose > 2)
EMSG("E904: third argument for call must be a list"); EMSG(_("E904: third argument for call must be a list"));
} }
else else
{ {
@@ -2195,7 +2195,7 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
else if (p_verbose > 2) else if (p_verbose > 2)
{ {
ch_errors(channel, "Received unknown command: %s", (char *)cmd); ch_errors(channel, "Received unknown command: %s", (char *)cmd);
EMSG2("E905: received unknown command: %s", cmd); EMSG2(_("E905: received unknown command: %s"), cmd);
} }
} }
@@ -3382,7 +3382,7 @@ channel_send(channel_T *channel, int part, char_u *buf, int len, char *fun)
if (!channel->ch_error && fun != NULL) if (!channel->ch_error && fun != NULL)
{ {
ch_errors(channel, "%s(): write while not connected", fun); ch_errors(channel, "%s(): write while not connected", fun);
EMSG2("E630: %s(): write while not connected", fun); EMSG2(_("E630: %s(): write while not connected"), fun);
} }
channel->ch_error = TRUE; channel->ch_error = TRUE;
return FAIL; return FAIL;
@@ -3407,7 +3407,7 @@ channel_send(channel_T *channel, int part, char_u *buf, int len, char *fun)
if (!channel->ch_error && fun != NULL) if (!channel->ch_error && fun != NULL)
{ {
ch_errors(channel, "%s(): write failed", fun); ch_errors(channel, "%s(): write failed", fun);
EMSG2("E631: %s(): write failed", fun); EMSG2(_("E631: %s(): write failed"), fun);
} }
channel->ch_error = TRUE; channel->ch_error = TRUE;
return FAIL; return FAIL;

4
src/evalfunc.c
View File

@@ -7413,7 +7413,7 @@ f_matchadd(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
return; return;
if (id >= 1 && id <= 3) if (id >= 1 && id <= 3)
{ {
EMSGN("E798: ID is reserved for \":match\": %ld", id); EMSGN(_("E798: ID is reserved for \":match\": %ld"), id);
return; return;
} }
@@ -7478,7 +7478,7 @@ f_matchaddpos(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
/* id == 3 is ok because matchaddpos() is supposed to substitute :3match */ /* id == 3 is ok because matchaddpos() is supposed to substitute :3match */
if (id == 1 || id == 2) if (id == 1 || id == 2)
{ {
EMSGN("E798: ID is reserved for \":match\": %ld", id); EMSGN(_("E798: ID is reserved for \":match\": %ld"), id);
return; return;
} }

4
src/ex_cmds.c
View File

@@ -7088,7 +7088,7 @@ helptags_one(
|| filecount == 0) || filecount == 0)
{ {
if (!got_int) if (!got_int)
EMSG2("E151: No match: %s", NameBuff); EMSG2(_("E151: No match: %s"), NameBuff);
return; return;
} }
@@ -7331,7 +7331,7 @@ do_helptags(char_u *dirname, int add_help_tags)
EW_FILE|EW_SILENT) == FAIL EW_FILE|EW_SILENT) == FAIL
|| filecount == 0) || filecount == 0)
{ {
EMSG2("E151: No match: %s", NameBuff); EMSG2(_("E151: No match: %s"), NameBuff);
return; return;
} }

2
src/spell.c
View File

@@ -2470,7 +2470,7 @@ did_set_spelllang(win_T *wp)
* destroying the buffer we are using... */ * destroying the buffer we are using... */
if (!bufref_valid(&bufref)) if (!bufref_valid(&bufref))
{ {
ret_msg = (char_u *)"E797: SpellFileMissing autocommand deleted buffer"; ret_msg = (char_u *)N_("E797: SpellFileMissing autocommand deleted buffer");
goto theend; goto theend;
} }
#endif #endif

2
src/version.c
View File

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

8
src/window.c
View File

@@ -6751,7 +6751,7 @@ match_add(
return -1; return -1;
if (id < -1 || id == 0) if (id < -1 || id == 0)
{ {
EMSGN("E799: Invalid ID: %ld (must be greater than or equal to 1)", id); EMSGN(_("E799: Invalid ID: %ld (must be greater than or equal to 1)"), id);
return -1; return -1;
} }
if (id != -1) if (id != -1)
@@ -6761,7 +6761,7 @@ match_add(
{ {
if (cur->id == id) if (cur->id == id)
{ {
EMSGN("E801: ID already taken: %ld", id); EMSGN(_("E801: ID already taken: %ld"), id);
return -1; return -1;
} }
cur = cur->next; cur = cur->next;
@@ -6938,7 +6938,7 @@ match_delete(win_T *wp, int id, int perr)
if (id < 1) if (id < 1)
{ {
if (perr == TRUE) if (perr == TRUE)
EMSGN("E802: Invalid ID: %ld (must be greater than or equal to 1)", EMSGN(_("E802: Invalid ID: %ld (must be greater than or equal to 1)"),
id); id);
return -1; return -1;
} }
@@ -6950,7 +6950,7 @@ match_delete(win_T *wp, int id, int perr)
if (cur == NULL) if (cur == NULL)
{ {
if (perr == TRUE) if (perr == TRUE)
EMSGN("E803: ID not found: %ld", id); EMSGN(_("E803: ID not found: %ld"), id);
return -1; return -1;
} }
if (cur == prev) if (cur == prev)