diff --git a/js/ajax.js b/js/ajax.js index a874a71880..e2a0cebcdf 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -800,13 +800,20 @@ $(document).ajaxError(function (event, request, settings) { } // Don't handle aborted requests if (request.status !== 0 || request.statusText !== 'abort') { - var errorCode = PMA_sprintf(PMA_messages.strErrorCode, request.status); - var errorText = PMA_sprintf(PMA_messages.strErrorText, request.statusText); + var details = '' + var state = request.state(); + + if (request.status !== 0) { + details += '
' + escapeHtml(PMA_sprintf(PMA_messages.strErrorCode, request.status)) + '
'; + } + details += '
' + escapeHtml(PMA_sprintf(PMA_messages.strErrorText, request.statusText + ' (' + state + ')')) + '
'; + if (state == 'rejected' || state == 'timeout') { + details += '
' + escapeHtml(PMA_messages.strErrorConnection) + '
'; + } PMA_ajaxShowMessage( '
' + PMA_messages.strErrorProcessingRequest + - '
' + escapeHtml(errorCode) + '
' + - '
' + escapeHtml(errorText) + '
' + + details + '
', false ); diff --git a/js/messages.php b/js/messages.php index a7f4c8547b..2368cd2d07 100644 --- a/js/messages.php +++ b/js/messages.php @@ -365,6 +365,10 @@ $js_messages['strRequestFailed'] = __('Request failed!!'); $js_messages['strErrorProcessingRequest'] = __('Error in processing request'); $js_messages['strErrorCode'] = __('Error code: %s'); $js_messages['strErrorText'] = __('Error text: %s'); +$js_messages['strErrorConnection'] = __( + 'It seems that the connection to server has been lost. Please check your ' . + 'network connectivity and server status.' +); $js_messages['strNoDatabasesSelected'] = __('No databases selected.'); $js_messages['strDroppingColumn'] = __('Dropping column'); $js_messages['strAddingPrimaryKey'] = __('Adding primary key');