Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix message handling to be more internationalizable

Browse Source
This commit is contained in:
Carson Gee
2014-05-09 11:19:59 -04:00
parent b3ec4d1b6b
commit 7c1e6d83e4
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/test/acceptance/tests/test_staff_view.py
View File

@@ -108,7 +108,7 @@ class StaffDebugTest(UniqueCourseTest):
msg = staff_debug_page.idash_msg[0]
# Since we aren't running celery stuff, this will fail badly
# for now, but is worth excercising that bad of a response
self.assertEqual(u'Unsuccessfully rescored problem. '
self.assertEqual(u'Failed to rescore problem. '
'Unknown Error Occurred.', msg)
def test_student_state_delete(self):
@@ -147,5 +147,5 @@ class StaffDebugTest(UniqueCourseTest):
staff_debug_page = staff_page.open_staff_debug_info()
staff_debug_page.delete_state('INVALIDUSER')
msg = staff_debug_page.idash_msg[0]
self.assertEqual(u'Unsuccessfully deleted student state. '
self.assertEqual(u'Failed to delete student state. '
'User does not exist.', msg)

22
lms/static/js/staff_debug_actions.js
View File

@@ -31,11 +31,8 @@ var StaffDebug = (function(){
data: pdata,
success: function(data){
var text = _.template(
gettext('Successfully {action} for user {user}'),
{
action: action.description,
user: data.student
},
action.success_msg,
{user: data.student},
{interpolate: /\{(.+?)\}/g}
)
var html = _.template(
@@ -53,10 +50,10 @@ var StaffDebug = (function(){
response_json = { error: gettext('Unknown Error Occurred.') };
}
var text = _.template(
gettext('Unsuccessfully {action}. {error}'),
'{error_msg} {error}',
{
error: response_json.error,
action: action.description
error_msg: action.error_msg,
error: response_json.error
},
{interpolate: /\{(.+?)\}/g}
)
@@ -75,7 +72,8 @@ var StaffDebug = (function(){
this.do_idash_action({
location: locname,
method: 'reset_student_attempts',
description: gettext('reset the attempts'),
success_msg: gettext('Successfully reset the attempts for user {user}'),
error_msg: gettext('Failed to reset attempts.'),
delete_module: false
});
}
@@ -84,7 +82,8 @@ var StaffDebug = (function(){
this.do_idash_action({
location: locname,
method: 'reset_student_attempts',
description: gettext('deleted student state'),
success_msg: gettext('Successfully deleted student state for user {user}'),
error_msg: gettext('Failed to delete student state.'),
delete_module: true
});
}
@@ -93,7 +92,8 @@ var StaffDebug = (function(){
this.do_idash_action({
location: locname,
method: 'rescore_problem',
description: gettext('rescored problem'),
success_msg: gettext('Successfully rescored problem for user {user}'),
error_msg: gettext('Failed to rescore problem.'),
delete_module: false
});
}