mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-02-01 03:12:42 +01:00
prepare to async: typos in error messages
This change extracts the grammar correction performed on the async branch, anticipating them in a single commit. It cannot be folded with the previous one, as it is not purely cosmetic.
This commit is contained in:
parent
9497ee734f
commit
e841798314
6 changed files with 12 additions and 12 deletions
|
@ -204,7 +204,7 @@ exports.getText = function(padID, rev, callback)
|
||||||
|
|
||||||
// ensure this is not a negative number
|
// ensure this is not a negative number
|
||||||
if (rev !== undefined && rev < 0) {
|
if (rev !== undefined && rev < 0) {
|
||||||
callback(new customError("rev is a negativ number", "apierror"));
|
callback(new customError("rev is a negative number", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@ exports.setText = function(padID, text, callback)
|
||||||
{
|
{
|
||||||
// text is required
|
// text is required
|
||||||
if (typeof text != "string") {
|
if (typeof text != "string") {
|
||||||
callback(new customError("text is no string", "apierror"));
|
callback(new customError("text is not a string", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,7 +286,7 @@ exports.appendText = function(padID, text, callback)
|
||||||
{
|
{
|
||||||
// text is required
|
// text is required
|
||||||
if (typeof text != "string") {
|
if (typeof text != "string") {
|
||||||
callback(new customError("text is no string", "apierror"));
|
callback(new customError("text is not a string", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -376,7 +376,7 @@ exports.setHTML = function(padID, html, callback)
|
||||||
{
|
{
|
||||||
// html is required
|
// html is required
|
||||||
if (typeof html != "string") {
|
if (typeof html != "string") {
|
||||||
callback(new customError("html is no string", "apierror"));
|
callback(new customError("html is not a string", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -472,7 +472,7 @@ exports.appendChatMessage = function(padID, text, authorID, time, callback)
|
||||||
{
|
{
|
||||||
// text is required
|
// text is required
|
||||||
if (typeof text != "string") {
|
if (typeof text != "string") {
|
||||||
callback(new customError("text is no string", "apierror"));
|
callback(new customError("text is not a string", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -569,7 +569,7 @@ exports.saveRevision = function(padID, rev, callback)
|
||||||
|
|
||||||
// ensure this is not a negative number
|
// ensure this is not a negative number
|
||||||
if (rev !== undefined && rev < 0) {
|
if (rev !== undefined && rev < 0) {
|
||||||
callback(new customError("rev is a negativ number", "apierror"));
|
callback(new customError("rev is a negative number", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -694,7 +694,7 @@ exports.restoreRevision = function(padID, rev, callback)
|
||||||
|
|
||||||
// ensure this is not a negative number
|
// ensure this is not a negative number
|
||||||
if (rev !== undefined && rev < 0) {
|
if (rev !== undefined && rev < 0) {
|
||||||
callback(new customError("rev is a negativ number", "apierror"));
|
callback(new customError("rev is a negative number", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -199,7 +199,7 @@ exports.createGroupIfNotExistsFor = function(groupMapper, callback)
|
||||||
{
|
{
|
||||||
// ensure mapper is optional
|
// ensure mapper is optional
|
||||||
if (typeof groupMapper != "string") {
|
if (typeof groupMapper != "string") {
|
||||||
callback(new customError("groupMapper is no string", "apierror"));
|
callback(new customError("groupMapper is not a string", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,7 @@ exports.createSession = function(groupID, authorID, validUntil, callback)
|
||||||
|
|
||||||
// ensure this is not a negative number
|
// ensure this is not a negative number
|
||||||
if (validUntil < 0) {
|
if (validUntil < 0) {
|
||||||
callback(new customError("validUntil is a negativ number", "apierror"));
|
callback(new customError("validUntil is a negative number", "apierror"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -151,7 +151,7 @@ exports.doImport = function(req, res, padId)
|
||||||
padManager.getPad(padId, function(err, _pad) {
|
padManager.getPad(padId, function(err, _pad) {
|
||||||
var headCount = _pad.head;
|
var headCount = _pad.head;
|
||||||
if (headCount >= 10) {
|
if (headCount >= 10) {
|
||||||
apiLogger.warn("Direct database Import attempt of a pad that already has content, we wont be doing this");
|
apiLogger.warn("Direct database Import attempt of a pad that already has content, we won't be doing this");
|
||||||
return callback("padHasData");
|
return callback("padHasData");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -457,7 +457,7 @@ function handleGetChatMessages(client, message)
|
||||||
var count = end - start;
|
var count = end - start;
|
||||||
|
|
||||||
if (count < 0 || count > 100) {
|
if (count < 0 || count > 100) {
|
||||||
messageLogger.warn("Dropped message, GetChatMessages Message, client requested invalid amout of messages!");
|
messageLogger.warn("Dropped message, GetChatMessages Message, client requested invalid amount of messages!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ exports.setSocketIO = function(_socket) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// drop message
|
// drop message
|
||||||
messageLogger.warn("Dropped message cause of bad permissions:" + stringifyWithoutPassword(message));
|
messageLogger.warn("Dropped message because of bad permissions:" + stringifyWithoutPassword(message));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue