Merge branch 'master' into 0.19

This commit is contained in:
Nick O'Leary
2018-07-18 13:22:35 +01:00
3 changed files with 16 additions and 8 deletions

View File

@@ -422,6 +422,10 @@
"url1": "URL should use ws:// or wss:// scheme and point to an existing websocket listener.",
"url2": "By default, <code>payload</code> will contain the data to be sent over, or received from a websocket. The client can be configured to send or receive the entire message object as a JSON formatted string."
},
"status": {
"connected": "connected __count__",
"connected_plural": "connected __count__"
},
"errors": {
"connect-error": "An error occured on the ws connection: ",
"send-error": "An error occurred while sending: ",