mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 03:16:31 +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

7
src/nvim/msgpack_rpc/channel.c
View File

@@ -192,7 +192,7 @@ Object channel_send_call(uint64_t id,
Channel *channel = NULL;
if (!(channel = pmap_get(uint64_t)(channels, id)) || channel->closed) {
api_set_error(err, kErrorTypeException, _("Invalid channel \"%" PRIu64 "\""), id);
api_set_error(err, kErrorTypeException, "Invalid channel: %" PRIu64, id);
api_free_array(args);
return NIL;
}
@@ -212,7 +212,8 @@ Object channel_send_call(uint64_t id,
if (frame.errored) {
if (frame.result.type == kObjectTypeString) {
api_set_error(err, kErrorTypeException, "%s", frame.result.data.string.data);
api_set_error(err, kErrorTypeException, "%s",
frame.result.data.string.data);
} else if (frame.result.type == kObjectTypeArray) {
// Should be an error in the form [type, message]
Array array = frame.result.data.array;
@@ -221,7 +222,7 @@ Object channel_send_call(uint64_t id,
|| array.items[0].data.integer == kErrorTypeValidation)
&& array.items[1].type == kObjectTypeString) {
api_set_error(err, (ErrorType)array.items[0].data.integer, "%s",
array.items[1].data.string.data);
array.items[1].data.string.data);
} else {
api_set_error(err, kErrorTypeException, "%s", "unknown error");
}