Merge pull request #2308 from edx/giulio/fix-error-msg-typo

Fixed all instances of "occured" typo

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(
                         {

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) {

common/lib/xmodule/xmodule/error_module.py

 """
-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
 """
 

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:

lms/templates/login.html

@@ -114,7 +114,7 @@
       </div>
 
       <div role="alert" class="status message submission-error" tabindex="-1">
-        <h3 class="message-title">${_("The following errors occured while logging you in:")} </h3>
+        <h3 class="message-title">${_("The following errors occurred while logging you in:")} </h3>
         <ul class="message-copy">
           <li>${_("Your email or password is incorrect")}</li>
         </ul>

lms/templates/register-shib.html

@@ -100,7 +100,7 @@
       </div>
 
       <div role="alert" class="status message submission-error" tabindex="-1">
-        <h3 class="message-title">${_("The following errors occured while processing your registration:")} </h3>
+        <h3 class="message-title">${_("The following errors occurred while processing your registration:")} </h3>
         <ul class="message-copy"> </ul>
       </div>
 

lms/templates/register.html

@@ -109,7 +109,7 @@
       </div>
 
       <div role="alert" class="status message submission-error" tabindex="-1">
-        <h3 class="message-title">${_("The following errors occured while processing your registration:")} </h3>
+        <h3 class="message-title">${_("The following errors occurred while processing your registration:")} </h3>
         <ul class="message-copy"> </ul>
       </div>
 

lms/templates/registration/password_reset_confirm.html

@@ -89,7 +89,7 @@
         </div>
 
         <div role="alert" class="status message submission-error">
-          <h3 class="message-title">{% trans "The following errors occured while processing your registration: " %}</h3>
+          <h3 class="message-title">{% trans "The following errors occurred while processing your registration: " %}</h3>
           <ul class="message-copy">
             <li>{% trans "You must complete all fields." %}</li>
             <li>{% trans "The two password fields didn't match." %}</li>

lms/templates/verify_student/_modal_editname.html

@@ -9,7 +9,7 @@
     <div id="change_name_body">
     <form id="course-checklists" class="course-checklists" method="post" action="">
       <div role="alert" class="status message submission-error" tabindex="-1">
-        <p class="message-title">${_("The following error occured while editing your name:")}
+        <p class="message-title">${_("The following error occurred while editing your name:")}
           <span class="message-copy"> </span>
         </p>
       </div>

lms/templates/verify_student/face_upload.html

@@ -301,7 +301,7 @@ $(document).ready(function() {
 </header>
   <form id="course-checklists" class="course-checklists" method="post" action="">
     <div role="alert" class="status message submission-error" tabindex="-1">
-      <p class="message-title">${_("The following error occured while editing your name:")}
+      <p class="message-title">${_("The following error occurred while editing your name:")}
         <span class="message-copy"> </span>
       </p>
     </div>