From 2b6224124ab177062cf8c718979b4905b6224be2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 11 Mar 2013 20:44:00 -0400 Subject: [PATCH 1/2] Bug 9797 - Untranslatable strings have returned to ajax.js The patch for Bug 8942 undid the changes to ajax.js made by Bug 9331. This patch puts those changes back. To test that preference-related error messages continue to work, open the system preferences editor in two tabs. Log out in one tab and try to save a system preference in the other. You should see correct error messages. Signed-off-by: Pierre Angot --- koha-tmpl/intranet-tmpl/prog/en/js/ajax.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js index 968334b..c9a45c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js @@ -15,20 +15,20 @@ KOHA.AJAX = { KOHA.xhr = xhr; if ( !xhr.getResponseHeader( 'content-type' ).match( 'application/json' ) ) { // Something really failed - humanMsg.displayAlert( _("Internal Server Error, please reload the page") ); + humanMsg.displayAlert( MSG_INTERNAL_SERVER_ERROR ); return; } var error = eval( '(' + xhr.responseText + ')' ); if ( error.type == 'auth' ) { - humanMsg.displayMsg( _("You need to log in again, your session has timed out") ); + humanMsg.displayMsg( MSG_SESSION_TIMED_OUT ); } if ( callback ) { callback( error ); } else { - humanMsg.displayAlert( _("Error; your data might not have been saved") ); + humanMsg.displayAlert( MSG_DATA_NOT_SAVED ); } }, MarkRunning: function ( selector, text ) { -- 1.7.10.4