gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

Browse Source
This commit is contained in:
Weblate 2015-03-23 14:14:28 +01:00
commit 4fc71718b1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/console.js
View File

@ -173,6 +173,11 @@ var PMA_console = {
PMA_console.ajaxCallback(data);
} catch (e) {
console.log("Invalid JSON!" + e.message);
if(AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') {
PMA_ajaxShowMessage($('<div />',{class:'error',html:PMA_messages.strRequestFailed+' ( '+AJAX.xhr.statusText+' )'}));
AJAX.active = false;
AJAX.xhr = null;
}
}
});

1
js/messages.php
View File

@ -258,6 +258,7 @@ $js_messages['strCancel'] = __('Cancel');
$js_messages['strLoading'] = __('Loading…');
$js_messages['strAbortedRequest'] = __('Request Aborted!!');
$js_messages['strProcessingRequest'] = __('Processing Request');
$js_messages['strRequestFailed'] = __('Request Failed!!');
$js_messages['strErrorProcessingRequest'] = __('Error in Processing Request');
$js_messages['strErrorCode'] = __('Error code: %s');
$js_messages['strErrorText'] = __('Error text: %s');