[jan] Consistently display the raw mailbox name in mailbox element ti…

…tles.
horde · May 25, 2016 · 5ed626e · 5ed626e
1 parent 8455c53
commit 5ed626e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v6.2.15-git
 -----------
 
+[jan] Consistently display the raw mailbox name in mailbox element titles.
 [jan] Unset window opener when opening new windows from HTML messages (João
       Machado <geral@jpaulo.eu>).
 [mjr] Fix re-adding an attachment after it has been removed from the compose

diff --git a/imp/js/compose-dimp.js b/imp/js/compose-dimp.js
@@ -119,12 +119,18 @@ var DimpCompose = {
 
         var identity = ImpComposeBase.identities[$F('identity')];
 
-        this.setPopdownLabel('sm', identity.sm_name, identity.sm_display, {
-            opts: {
-                input: 'save_sent_mail_mbox',
-                label: 'sent_mail_label'
+        this.setPopdownLabel(
+            'sm',
+            identity.sm_name,
+            identity.sm_display,
+            identity.sm_title,
+            {
+                opts: {
+                    input: 'save_sent_mail_mbox',
+                    label: 'sent_mail_label'
+                }
             }
-        });
+        );
         if (identity.bcc) {
             $('bcc').setValue(($F('bcc') ? $F('bcc') + ', ' : '') + identity.bcc)
                 .fire('AutoComplete:reset');
@@ -177,7 +183,7 @@ var DimpCompose = {
         });
     },
 
-    setPopdownLabel: function(id, s, l, k)
+    setPopdownLabel: function(id, s, l, t, k)
     {
         var input;
 
@@ -208,7 +214,7 @@ var DimpCompose = {
         }
 
         input.setValue(s);
-        $(k.opts.label).writeAttribute('title', l.escapeHTML()).setText(l.truncate(15)).up(1).show();
+        $(k.opts.label).writeAttribute('title', t).setText(l.truncate(15)).up(1).show();
 
         if (k.knl) {
             k.knl.setSelected(s);

diff --git a/imp/lib/Ajax/Queue.php b/imp/lib/Ajax/Queue.php
@@ -643,7 +643,7 @@ protected function _ftreeElt($id)
         }
 
         $ob->l = htmlspecialchars($mbox_ob->abbrev_label);
-        $label = $mbox_ob->label;
+        $label = $mbox_ob->display_notranslate;
         if ($ob->l != $label) {
             $ob->t = $label;
         }

diff --git a/imp/lib/Compose/Ui.php b/imp/lib/Compose/Ui.php
@@ -138,6 +138,8 @@ public function addIdentityJs()
                 'sm_name' => $sm ? $sm->form_to : '',
                 // Save in sent mail mailbox by default?
                 'sm_save' => (bool)$identity->saveSentmail($ident),
+                // Sent mail title
+                'sm_title' => $sm ? $sm->display_notranslate : '',
                 // Sent mail display name
                 'sm_display' => $sm ? $sm->display_html : '',
                 // Bcc addresses to add

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Consistently display the raw mailbox name in mailbox element titles.
 * [jan] Unset window opener when opening new windows from HTML messages (João Machado &lt;geral@jpaulo.eu&gt;).
 * [mjr] Fix re-adding an attachment after it has been removed from the compose window (Bug #14329).
  </notes>
@@ -3944,6 +3945,7 @@
    <date>2016-04-05</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Consistently display the raw mailbox name in mailbox element titles.
 * [jan] Unset window opener when opening new windows from HTML messages (João Machado &lt;geral@jpaulo.eu&gt;).
 * [mjr] Fix re-adding an attachment after it has been removed from the compose window (Bug #14329).
    </notes>