diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-04-04 19:54:08 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-04-04 19:58:24 +0200 |
| commit | 92e81cbf22b78bd06bae8006cd5cda57660838c8 (patch) | |
| tree | 12f9503d3fd2b5f9579e3cfa973efa7ec6872187 | |
| parent | 4044be4f1934ee41e51524d681b688dd7671a60e (diff) | |
Improve error message on failed http connection
| -rw-r--r-- | program/include/rcmail.php | 2 | ||||
| -rw-r--r-- | program/js/app.js | 4 | ||||
| -rw-r--r-- | program/localization/en_US/messages.inc | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index c026eed67..07876d6b0 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -431,7 +431,7 @@ class rcmail extends rcube } // add some basic labels to client - $this->output->add_label('loading', 'servererror', 'requesttimedout', 'refreshing'); + $this->output->add_label('loading', 'servererror', 'connerror', 'requesttimedout', 'refreshing'); return $this->output; } diff --git a/program/js/app.js b/program/js/app.js index f9d4bb056..6d2581a0b 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1901,7 +1901,7 @@ function rcube_webmail() tree += '<span id="msgicn'+uid+'" class="'+css_class+'"> </span>'; row.className = row_class; - // build subject link + // build subject link if (cols.subject) { var action = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show'; var uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid'; @@ -7063,7 +7063,7 @@ function rcube_webmail() else if (status == 'timeout') this.display_message(this.get_label('requesttimedout'), 'error'); else if (request.status == 0 && status != 'abort') - this.display_message(this.get_label('servererror') + ' (No connection)', 'error'); + this.display_message(this.get_label('connerror'), 'error'); // redirect to url specified in location header if not empty var location_url = request.getResponseHeader("Location"); diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index ce8722812..0a1824398 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -24,6 +24,7 @@ $messages['sessionerror'] = 'Your session is invalid or expired.'; $messages['storageerror'] = 'Connection to storage server failed.'; $messages['servererror'] = 'Server Error!'; $messages['servererrormsg'] = 'Server Error: $msg'; +$messages['connerror'] = 'Connection Error (Failed to reach the server)!'; $messages['dberror'] = 'Database Error!'; $messages['requesttimedout'] = 'Request timed out'; $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.'; |