summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-08-10 11:09:16 +0000
committerthomascube <thomas@roundcube.net>2011-08-10 11:09:16 +0000
commitf2ff370215957f58edb734f65e8c60bcef0f0f47 (patch)
treef5bd80f58490a216d2da276c077015a9f375a8dd /program
parentd145f77f36adff40a9899657081e129eced62510 (diff)
Recalculate date when replying to a message and localize the cite header (#1487675)
Diffstat (limited to 'program')
-rw-r--r--program/localization/de_CH/labels.inc1
-rw-r--r--program/localization/de_DE/labels.inc1
-rw-r--r--program/localization/en_US/labels.inc1
-rw-r--r--program/steps/mail/compose.inc9
4 files changed, 10 insertions, 2 deletions
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 46bed714e..d2bdf1f1d 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -172,6 +172,7 @@ $labels['charset'] = 'Zeichensatz';
$labels['editortype'] = 'Editor-Typ';
$labels['returnreceipt'] = 'Empfangsbestätigung (MDN)';
$labels['dsn'] = 'Übermittlungsbestätigung (DSN)';
+$labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
$labels['editidents'] = 'Absender bearbeiten';
$labels['checkspelling'] = 'Rechtschreibung prüfen';
$labels['resumeediting'] = 'Bearbeitung fortsetzen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index bb1d6bb08..b3fe64249 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -173,6 +173,7 @@ $labels['charset'] = 'Zeichensatz';
$labels['editortype'] = 'Editor Typ';
$labels['returnreceipt'] = 'Empfangsbestätigung (MSN)';
$labels['dsn'] = 'Übermittlungsbestätigung (DSN)';
+$labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
$labels['editidents'] = 'Absender ändern';
$labels['checkspelling'] = 'Rechtschreibung prüfen';
$labels['resumeediting'] = 'Bearbeitung fortsetzen';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index b6de28bcd..efbc9a673 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -202,6 +202,7 @@ $labels['charset'] = 'Charset';
$labels['editortype'] = 'Editor type';
$labels['returnreceipt'] = 'Return receipt';
$labels['dsn'] = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
$labels['editidents'] = 'Edit identities';
$labels['checkspelling'] = 'Check spelling';
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 1934194ce..31de0d9ee 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -758,8 +758,13 @@ function rcmail_create_reply_body($body, $bodyIsHtml)
// build reply prefix
$from = array_pop($RCMAIL->imap->decode_address_list($MESSAGE->get_header('from'), 1, false));
- $prefix = sprintf("On %s, %s wrote:",
- $MESSAGE->headers->date, $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']));
+ $prefix = rcube_label(array(
+ 'name' => 'mailreplyintro',
+ 'vars' => array(
+ 'date' => format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')),
+ 'sender' => $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']),
+ )
+ ));
if (!$bodyIsHtml) {
$body = preg_replace('/\r?\n/', "\n", $body);