diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 6f4488747a..bd399e8c88 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -155,9 +155,7 @@ class @CombinedOpenEnded
@is_ctrl = false
#Setup reset
@reset_button = @$(@reset_button_sel)
- @reset_button.click ->
- if confirm "Are you sure you want to remove your previous response to this question?"
- @reset
+ @reset_button.click @reset
#Setup next problem
@next_problem_button = @$(@next_step_sel)
@next_problem_button.click @next_problem
@@ -293,9 +291,7 @@ class @CombinedOpenEnded
else if @child_state == 'initial'
@answer_area.attr("disabled", false)
@submit_button.prop('value', 'Submit')
- @submit_button.click ->
- if confirm "Please confirm that you wish to submit your work. You will not be able to make any changes after submitting."
- @save_answer
+ @submit_button.click @save_answer
@setup_file_upload()
else if @child_state == 'assessing'
@answer_area.attr("disabled", true)
@@ -308,7 +304,7 @@ class @CombinedOpenEnded
@submit_button.hide()
@queueing()
@grader_status = @$(@grader_status_sel)
- @grader_status.html("Your response has been submitted. Please check back later for your grade.")
+ @grader_status.html("Your response has been submitted. Please check back later for your grade. ")
else if @child_type == "selfassessment"
@setup_score_selection()
else if @child_state == 'post_assessment'
diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
index 3722344d6b..2adc35aa92 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
@@ -27,7 +27,7 @@ class @PeerGradingProblemBackend
else
# if this post request fails, the error callback will catch it
$.post(@ajax_url + cmd, data, callback)
- .error => callback({success: false, error: "Error occurred while performing this operation"})
+ .error => callback({success: false, error: "Error occured while performing this operation"})
mock: (cmd, data) ->
if cmd == 'is_student_calibrated'
@@ -460,8 +460,8 @@ class @PeerGradingProblem
@flag_student_container.hide()
@answer_unknown_container.hide()
- @feedback_area.val("Once you are done with training and are grading real student essays, you will be asked to share feedback with them in addition to grading their rubric.")
- @feedback_area.attr('disabled', true)
+ @feedback_area.val("")
+
@submit_button.show()
@submit_button.unbind('click')
@submit_button.click @submit_calibration_essay
@@ -499,7 +499,6 @@ class @PeerGradingProblem
@change_tracker.rebindTracker()
else
@feedback_area.val("")
- @feedback_area.attr('disabled', false)
@answer_unknown_checkbox.removeAttr("checked")
@flag_student_checkbox.removeAttr("checked")
@submit_button.show()
@@ -510,7 +509,7 @@ class @PeerGradingProblem
else if response.error
@render_error(response.error)
else
- @render_error("An error occurred when retrieving the next submission.")
+ @render_error("An error occured when retrieving the next submission.")
make_paragraphs: (text) ->
paragraph_split = text.split(/\n\s*\n/)
diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py
index d6610401f8..f5a2471226 100644
--- a/lms/djangoapps/open_ended_grading/views.py
+++ b/lms/djangoapps/open_ended_grading/views.py
@@ -70,8 +70,8 @@ ALERT_DICT = {
'Flagged Submissions': "Submissions have been flagged for review"
}
-STUDENT_ERROR_MESSAGE = "Error occurred while contacting the grading service. Please notify course staff."
-STAFF_ERROR_MESSAGE = "Error occurred while contacting the grading service. Please notify the development team. If you do not have a point of contact, please email Vik at vik@edx.org"
+STUDENT_ERROR_MESSAGE = "Error occured while contacting the grading service. Please notify course staff."
+STAFF_ERROR_MESSAGE = "Error occured while contacting the grading service. Please notify the development team. If you do not have a point of contact, please email Vik at vik@edx.org"
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
diff --git a/lms/static/coffee/src/open_ended/open_ended.coffee b/lms/static/coffee/src/open_ended/open_ended.coffee
index 058776bda8..bfb0fa5931 100644
--- a/lms/static/coffee/src/open_ended/open_ended.coffee
+++ b/lms/static/coffee/src/open_ended/open_ended.coffee
@@ -41,7 +41,7 @@ class OpenEnded
post: (cmd, data, callback) ->
# if this post request fails, the error callback will catch it
$.post(@ajax_url + cmd, data, callback)
- .error => callback({success: false, error: "Error occurred while performing javascript ajax post."})
+ .error => callback({success: false, error: "Error occured while performing javascript ajax post."})
after_action_wrapper: (target, action_type) ->
tr_parent = target.parent().parent()
diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index 80487f24ee..ef76bb31f7 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -142,7 +142,7 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t
else
# TODO: replace with postWithPrefix when that's loaded
$.post(@ajax_url + cmd, data, callback)
- .error => callback({success: false, error: "Error occurred while performing javascript AJAX post."})
+ .error => callback({success: false, error: "Error occured while performing javascript AJAX post."})
class @StaffGrading