diff options
| -rw-r--r-- | settings.json.template | 2 | ||||
| -rw-r--r-- | src/static/js/admin/plugins.js | 4 | ||||
| -rw-r--r-- | src/static/js/pad_utils.js | 2 | ||||
| -rw-r--r-- | src/templates/pad.html | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/settings.json.template b/settings.json.template index 418048f6..6af5f78a 100644 --- a/settings.json.template +++ b/settings.json.template @@ -195,7 +195,7 @@ , "level": "error" // filters out all log messages that have a lower level than "error" , "appender": { "type": "smtp" - , "subject": "An error occured in your EPL instance!" + , "subject": "An error occurred in your EPL instance!" , "recipients": "bar@blurdybloop.com, baz@blurdybloop.com" , "sendInterval": 300 // 60 * 5 = 5 minutes -- will buffer log messages; set to 0 to send a mail for every message , "transport": "SMTP", "SMTP": { // see https://github.com/andris9/Nodemailer#possible-transport-methods diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 48d1ab70..3f88d9b1 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -228,7 +228,7 @@ $(document).ready(function () { if(data.code === "EPEERINVALID"){ alert("This plugin requires that you update Etherpad so it can operate in it's true glory"); } - alert('An error occured while installing '+data.plugin+' \n'+data.error) + alert('An error occurred while installing '+data.plugin+' \n'+data.error) $('#installed-plugins .'+data.plugin).remove() } @@ -241,7 +241,7 @@ $(document).ready(function () { }) socket.on('finished:uninstall', function(data) { - if(data.error) alert('An error occured while uninstalling the '+data.plugin+' \n'+data.error) + if(data.error) alert('An error occurred while uninstalling the '+data.plugin+' \n'+data.error) // remove plugin from installed list $('#installed-plugins .'+data.plugin).remove() diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js index 5a7700c9..7166e0fb 100644 --- a/src/static/js/pad_utils.js +++ b/src/static/js/pad_utils.js @@ -520,7 +520,7 @@ function setupGlobalExceptionHandler() { //show javascript errors to the user $("#editorloadingbox").css("padding", "10px"); $("#editorloadingbox").css("padding-top", "45px"); - $("#editorloadingbox").html("<div style='text-align:left;color:red;font-size:16px;'><b>An error occured</b><br>The error was reported with the following id: '" + errorId + "'<br><br><span style='color:black;font-weight:bold;font-size:16px'>Please press and hold Ctrl and press F5 to reload this page, if the problem persists please send this error message to your webmaster: </span><div style='color:black;font-size:14px'>'" + $("#editorloadingbox").html("<div style='text-align:left;color:red;font-size:16px;'><b>An error occurred</b><br>The error was reported with the following id: '" + errorId + "'<br><br><span style='color:black;font-weight:bold;font-size:16px'>Please press and hold Ctrl and press F5 to reload this page, if the problem persists please send this error message to your webmaster: </span><div style='color:black;font-size:14px'>'" + "ErrorId: " + errorId + "<br>URL: " + window.location.href + "<br>UserAgent: " + userAgent + "<br>" + msg + " in " + url + " at line " + linenumber + "'</div></div>"); } diff --git a/src/templates/pad.html b/src/templates/pad.html index 271bbb2d..3d89f9d0 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -358,7 +358,7 @@ var originalHandler = window.onerror; window.onerror = function(msg, url, line) { var box = document.getElementById('editorloadingbox'); - box.innerHTML = '<p><b>An error occured while loading the pad</b></p>' + box.innerHTML = '<p><b>An error occurred while loading the pad</b></p>' + '<p><b>'+msg+'</b> ' + '<small>in '+ url +' (line '+ line +')</small></p>'; // call original error handler |