diff --git a/cms/djangoapps/contentstore/views/import_export.py b/cms/djangoapps/contentstore/views/import_export.py index 1bb8fea4a6..df1586e88c 100644 --- a/cms/djangoapps/contentstore/views/import_export.py +++ b/cms/djangoapps/contentstore/views/import_export.py @@ -236,7 +236,7 @@ def import_handler(request, tag=None, package_id=None, branch=None, version_guid auth.add_users(request.user, CourseStaffRole(new_location), request.user) logging.debug('created all course groups at {0}'.format(new_location)) - # Send errors to client with stage at which error occured. + # Send errors to client with stage at which error occurred. except Exception as exception: # pylint: disable=W0703 return JsonResponse( { diff --git a/cms/static/js/views/import.js b/cms/static/js/views/import.js index ca9d9bbe05..6b37d175ce 100644 --- a/cms/static/js/views/import.js +++ b/cms/static/js/views/import.js @@ -124,7 +124,7 @@ define( /** * Give error message at the list element that corresponds to the stage * where the error occurred. - * @param {int} stageNo Stage of import process at which error occured. + * @param {int} stageNo Stage of import process at which error occurred. * @param {string} msg Error message to display. */ stageError: function (stageNo, msg) { diff --git a/common/lib/xmodule/xmodule/error_module.py b/common/lib/xmodule/xmodule/error_module.py index 4f7ad25eb0..4a513aad95 100644 --- a/common/lib/xmodule/xmodule/error_module.py +++ b/common/lib/xmodule/xmodule/error_module.py @@ -1,5 +1,5 @@ """ -Modules that get shown to the users when an error has occured while +Modules that get shown to the users when an error has occurred while loading or rendering other modules """ diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py index 4015d0adfe..7cba7894a9 100644 --- a/lms/djangoapps/courseware/grades.py +++ b/lms/djangoapps/courseware/grades.py @@ -474,7 +474,7 @@ def iterate_grades_for(course_id, students): (student, gradeset, err_msg) for every student enrolled in the course. - If an error occured, gradeset will be an empty dict and err_msg will be an + If an error occurred, gradeset will be an empty dict and err_msg will be an exception message. If there was no error, err_msg is an empty string. The gradeset is a dictionary with the following fields: diff --git a/lms/templates/login.html b/lms/templates/login.html index 4a379ab0c2..ced736ffa5 100644 --- a/lms/templates/login.html +++ b/lms/templates/login.html @@ -114,7 +114,7 @@
diff --git a/lms/templates/register.html b/lms/templates/register.html index ce054725f8..f635bbf446 100644 --- a/lms/templates/register.html +++ b/lms/templates/register.html @@ -108,7 +108,7 @@ diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html index bcad5d8da5..4ee2defe84 100644 --- a/lms/templates/registration/password_reset_confirm.html +++ b/lms/templates/registration/password_reset_confirm.html @@ -89,7 +89,7 @@