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 <tredok.pierre@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
KOHA.xhr = xhr;
if ( !xhr.getResponseHeader( 'content-type' ).match( 'application/json' ) ) {
// Something really failed
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' ) {
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 {
}
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 ) {
}
},
MarkRunning: function ( selector, text ) {