From adaddf0b188eca228d626973f193b2a51de2dbe7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 04 Apr 2014 13:54:08 -0400
Subject: [PATCH] Improve error message on failed http connection
---
program/include/rcmail.php | 2 +-
program/localization/en_US/messages.inc | 1 +
program/js/app.js | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 9e57a8e..7a6fb89 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -426,7 +426,7 @@
}
// 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 7fb6441..eea72f0 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1901,7 +1901,7 @@
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';
@@ -7069,7 +7069,7 @@
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 ce87228..0a18243 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -24,6 +24,7 @@
$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.';
--
Gitblit v1.9.1