From 74d421d55ae35a18440d738245fbc68c7f75d5b4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 17 May 2009 03:04:51 -0400
Subject: [PATCH] - don't show message on unknown error (#1485848) + translate "Server Error!" message
---
program/include/rcmail.php | 2 +-
program/localization/en_US/messages.inc | 1 +
program/localization/pl_PL/messages.inc | 2 +-
program/js/app.js | 3 ++-
program/localization/en_GB/messages.inc | 1 +
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index ec0a6f4..ea53d91 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -324,7 +324,7 @@
$this->output->set_charset($this->config->get('charset', RCMAIL_CHARSET));
// add some basic label to client
- $this->output->add_label('loading');
+ $this->output->add_label('loading', 'servererror');
return $this->output;
}
diff --git a/program/js/app.js b/program/js/app.js
index da480aa..ec94b5a 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3945,7 +3945,8 @@
this.set_busy(false);
request.abort();
- this.display_message('Unknown Server Error!' + (errmsg ? ' ('+errmsg+')' : ''), 'error');
+ if (errmsg)
+ this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
};
// use an image to send a keep-alive siganl to the server
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 9f7d662..5823187 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -22,6 +22,7 @@
$messages['cookiesdisabled'] = 'Your browser does not accept cookies';
$messages['sessionerror'] = 'Your session is invalid or has expired';
$messages['imaperror'] = 'Connection to IMAP server failed';
+$messages['servererror'] = 'Server Error!';
$messages['nomessagesfound'] = 'No messages found in this mailbox';
$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
$messages['mailboxempty'] = 'Mailbox is empty';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index af7443e..c1ba41d 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -22,6 +22,7 @@
$messages['cookiesdisabled'] = 'Your browser does not accept cookies';
$messages['sessionerror'] = 'Your session is invalid or expired';
$messages['imaperror'] = 'Connection to IMAP server failed';
+$messages['servererror'] = 'Server Error!';
$messages['nomessagesfound'] = 'No messages found in this mailbox';
$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
$messages['mailboxempty'] = 'Mailbox is empty';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index ac76383..6b47e3a 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -27,6 +27,7 @@
$messages['cookiesdisabled'] = 'Twoja przeglądarka nie obsługuje ciasteczek!';
$messages['sessionerror'] = 'Błąd sesji bądź sesja wygasła!';
$messages['imaperror'] = 'Błąd połączenia z serwerem!';
+$messages['servererror'] = 'Błąd serwera!';
$messages['nomessagesfound'] = 'Brak wiadomości w skrzynce.';
$messages['loggedout'] = 'Użytkownik wylogował się poprawnie.';
$messages['mailboxempty'] = 'Skrzynka jest pusta!';
@@ -99,6 +100,5 @@
$messages['opnotpermitted'] = 'Niedozwolona operacja!';
$messages['nofromaddress'] = 'Brak adresu e-mail w wybranej tożsamości';
$messages['editorwarning'] = 'Zmiana edytora spowoduje utratę formatowania tekstu. Czy jesteś pewien, że chcesz to zrobić?';
-$messages['httpreceivedencrypterror'] = 'Wystąpił błąd systemu. Skontaktuj się z administratorem. <b>Nie można wysłać wiadomości.</b>';
?>
--
Gitblit v1.9.1