diff --git a/settings.json.template b/settings.json.template index 418048f66..6af5f78ad 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 48d1ab70a..3f88d9b11 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 5a7700c94..7166e0fb5 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("
An error occured while loading the pad
' + box.innerHTML = 'An error occurred while loading the pad
' + ''+msg+' ' + 'in '+ url +' (line '+ line +')
'; // call original error handler