Fix rendering of subjects in RTL scripts when using LTR translations (vilius@lnk...

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 752a6d4..fb57740 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -50,6 +50,10 @@ v5.0-git
 v4.3.4-cvs
 ----------
 
+[jan] Fix rendering of subjects in RTL scripts when using LTR translations
+      (vilius@lnk.lt, Bug #3511).
+[mms] Add hook to allow hiding of IMAP folders (Request #7353, Gunnar
+      Wrobel <p@rdus.de>).
 [jan] Fix logging of messages forwarded with attachments (Bug #7911).
 
 

diff --git a/imp/message.php b/imp/message.php
index b2794bb..57a7428 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -437,7 +437,8 @@ if (!IMP::$printMode) {
     $t_template->set('thismailbox', htmlspecialchars($mailbox_name));
     $t_template->set('start', htmlspecialchars($msgindex));
     $t_template->set('index', htmlspecialchars($index));
-    $t_template->set('label', sprintf(_("%s: %s (%d of %d)"), $header_label, $shortsub, $msgindex, $imp_mailbox->getMessageCount()));
+    $t_template->set('label', sprintf(_("%s: %s"), $header_label, $shortsub));
+    $t_template->set('msg_count', sprintf(_("(%d of %d)"), $msgindex, $imp_mailbox->getMessageCount()));
     $t_template->set('status', $status);
     $t_template->set('message_token', $message_token);
 

diff --git a/imp/templates/message/navbar_top.html b/imp/templates/message/navbar_top.html
index 299d7d9..36fc85c 100644 (file)
--- a/imp/templates/message/navbar_top.html
+++ b/imp/templates/message/navbar_top.html
@@ -9,5 +9,5 @@
 <input type="hidden" name="index" value="<tag:index />" />
 <input type="hidden" id="newMbox" name="newMbox" value="0" />
 <h1 class="header">
- <tag:label /> <tag:status />
+ <tag:label /> <span style="unicode-bidi: embed"><tag:msg_count /></span> <tag:status />
 </h1>