Changeset 5040 in subversion

Timestamp:

Aug 10, 2011 7:09:16 AM (23 months ago)

Author:

thomasb

Message:

Recalculate date when replying to a message and localize the cite header (#1487675)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/localization/de_CH/labels.inc (modified) (1 diff)
• program/localization/de_DE/labels.inc (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Recalculate date when replying to a message and localize the cite header (#1487675)
 - Fix XSS vulnerability in UI messages (#1488030)
 - Fix handling of email addresses with quoted local part (#1487939)

trunk/roundcubemail/program/localization/de_CH/labels.inc

@@ -173 +173 @@
 $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';

trunk/roundcubemail/program/localization/de_DE/labels.inc

@@ -174 +174 @@
 $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';

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -203 +203 @@
 $labels['returnreceipt']  = 'Return receipt';
 $labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
 
 $labels['editidents']    = 'Edit identities';

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -759 +759 @@
   // 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) {