mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

api: Do not translate error messages.

Browse Source 
Also re-word some error messages:
- "Key does not exist: %s"
- "Invalid channel: %<PRIu64>"
- "Request array size must be 4 (request) or 3 (notification)"
- "String cannot contain newlines"

References #6150
This commit is contained in:
Justin M. Keyes
2017-04-23 22:30:08 +02:00
parent e2936ed397
commit 086c354a0a
13 changed files with 102 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/nvim/api/private/helpers.c
View File

@@ -61,7 +61,7 @@ bool try_end(Error *err)
discard_current_exception();
}
api_set_error(err, kErrorTypeException, _("Keyboard interrupt"));
api_set_error(err, kErrorTypeException, "Keyboard interrupt");
got_int = false;
} else if (msg_list != NULL && *msg_list != NULL) {
int should_free;
@@ -93,8 +93,8 @@ Object dict_get_value(dict_T *dict, String key, Error *err)
dictitem_T *const di = tv_dict_find(dict, key.data, (ptrdiff_t)key.size);
if (di == NULL) {
api_set_error(err, kErrorTypeValidation, _("Key not found"));
return (Object) OBJECT_INIT;
api_set_error(err, kErrorTypeValidation, "Key not found");
return (Object)OBJECT_INIT;
}
return vim_to_object(&di->di_tv);
@@ -117,17 +117,18 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
Object rv = OBJECT_INIT;
if (dict->dv_lock) {
api_set_error(err, kErrorTypeException, _("Dictionary is locked"));
api_set_error(err, kErrorTypeException, "Dictionary is locked");
return rv;
}
if (key.size == 0) {
api_set_error(err, kErrorTypeValidation, _("Empty variable names aren't allowed"));
api_set_error(err, kErrorTypeValidation,
"Empty variable names aren't allowed");
return rv;
}
if (key.size > INT_MAX) {
api_set_error(err, kErrorTypeValidation, _("Key length is too high"));
api_set_error(err, kErrorTypeValidation, "Key length is too high");
return rv;
}
@@ -135,13 +136,13 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
if (di != NULL) {
if (di->di_flags & DI_FLAGS_RO) {
api_set_error(err, kErrorTypeException, _("Key is read-only: %s"), key.data);
api_set_error(err, kErrorTypeException, "Key is read-only: %s", key.data);
return rv;
} else if (di->di_flags & DI_FLAGS_FIX) {
api_set_error(err, kErrorTypeException, _("Key is fixed: %s"), key.data);
api_set_error(err, kErrorTypeException, "Key is fixed: %s", key.data);
return rv;
} else if (di->di_flags & DI_FLAGS_LOCK) {
api_set_error(err, kErrorTypeException, _("Key is locked: %s"), key.data);
api_set_error(err, kErrorTypeException, "Key is locked: %s", key.data);
return rv;
}
}
@@ -150,7 +151,8 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
// Delete the key
if (di == NULL) {
// Doesn't exist, fail
api_set_error(err, kErrorTypeValidation, _("Key \"%s\" doesn't exist"), key.data);
api_set_error(err, kErrorTypeValidation, "Key does not exist: %s",
key.data);
} else {
// Return the old value
if (retval) {
@@ -202,7 +204,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
Object rv = OBJECT_INIT;
if (name.size == 0) {
api_set_error(err, kErrorTypeValidation, _("Empty option name"));
api_set_error(err, kErrorTypeValidation, "Empty option name");
return rv;
}
@@ -215,7 +217,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
if (!flags) {
api_set_error(err,
kErrorTypeValidation,
_("Invalid option name \"%s\""),
"Invalid option name \"%s\"",
name.data);
return rv;
}
@@ -234,13 +236,13 @@ Object get_option_from(void *from, int type, String name, Error *err)
} else {
api_set_error(err,
kErrorTypeException,
_("Unable to get value for option \"%s\""),
"Unable to get value for option \"%s\"",
name.data);
}
} else {
api_set_error(err,
kErrorTypeException,
_("Unknown type for option \"%s\""),
"Unknown type for option \"%s\"",
name.data);
}
@@ -257,7 +259,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
void set_option_to(void *to, int type, String name, Object value, Error *err)
{
if (name.size == 0) {
api_set_error(err, kErrorTypeValidation, _("Empty option name"));
api_set_error(err, kErrorTypeValidation, "Empty option name");
return;
}
@@ -266,7 +268,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (flags == 0) {
api_set_error(err,
kErrorTypeValidation,
_("Invalid option name \"%s\""),
"Invalid option name \"%s\"",
name.data);
return;
}
@@ -275,14 +277,14 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (type == SREQ_GLOBAL) {
api_set_error(err,
kErrorTypeException,
_("Unable to unset option \"%s\""),
"Unable to unset option \"%s\"",
name.data);
return;
} else if (!(flags & SOPT_GLOBAL)) {
api_set_error(err,
kErrorTypeException,
_("Cannot unset option \"%s\" "
"because it doesn't have a global value"),
"Cannot unset option \"%s\" "
"because it doesn't have a global value",
name.data);
return;
} else {
@@ -297,7 +299,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (value.type != kObjectTypeBoolean) {
api_set_error(err,
kErrorTypeValidation,
_("Option \"%s\" requires a boolean value"),
"Option \"%s\" requires a boolean value",
name.data);
return;
}
@@ -308,7 +310,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (value.type != kObjectTypeInteger) {
api_set_error(err,
kErrorTypeValidation,
_("Option \"%s\" requires an integer value"),
"Option \"%s\" requires an integer value",
name.data);
return;
}
@@ -316,7 +318,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (value.data.integer > INT_MAX || value.data.integer < INT_MIN) {
api_set_error(err,
kErrorTypeValidation,
_("Value for option \"%s\" is outside range"),
"Value for option \"%s\" is outside range",
name.data);
return;
}
@@ -327,7 +329,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (value.type != kObjectTypeString) {
api_set_error(err,
kErrorTypeValidation,
_("Option \"%s\" requires a string value"),
"Option \"%s\" requires a string value",
name.data);
return;
}
@@ -560,7 +562,7 @@ buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
buf_T *rv = handle_get_buffer(buffer);
if (!rv) {
api_set_error(err, kErrorTypeValidation, _("Invalid buffer id"));
api_set_error(err, kErrorTypeValidation, "Invalid buffer id");
}
return rv;
@@ -575,7 +577,7 @@ win_T *find_window_by_handle(Window window, Error *err)
win_T *rv = handle_get_window(window);
if (!rv) {
api_set_error(err, kErrorTypeValidation, _("Invalid window id"));
api_set_error(err, kErrorTypeValidation, "Invalid window id");
}
return rv;
@@ -590,7 +592,7 @@ tabpage_T *find_tab_by_handle(Tabpage tabpage, Error *err)
tabpage_T *rv = handle_get_tabpage(tabpage);
if (!rv) {
api_set_error(err, kErrorTypeValidation, _("Invalid tabpage id"));
api_set_error(err, kErrorTypeValidation, "Invalid tabpage id");
}
return rv;
@@ -658,7 +660,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
case kObjectTypeInteger:
if (obj.data.integer > VARNUMBER_MAX
|| obj.data.integer < VARNUMBER_MIN) {
api_set_error(err, kErrorTypeValidation, _("Integer value outside range"));
api_set_error(err, kErrorTypeValidation, "Integer value outside range");
return false;
}
@@ -713,7 +715,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
if (key.size == 0) {
api_set_error(err, kErrorTypeValidation,
_("Empty dictionary keys aren't allowed"));
"Empty dictionary keys aren't allowed");
// cleanup
tv_dict_free(dict);
return false;
@@ -938,7 +940,7 @@ static void set_option_value_for(char *key,
}
api_set_error(err,
kErrorTypeException,
_("Problem while switching windows"));
"Problem while switching windows");
return;
}
set_option_value_err(key, numval, stringval, opt_flags, err);