Display translated mailbox names in drop down lists again.

This was explicitely disabled a while ago, and while I can see why it makes sense to have the raw, untranslated mailbox names available when picking a special mailbox for a preference, this makes a really inconsistent UI, with different folder list at different locations - very confusing.
horde · May 25, 2016 · bd5d9f8 · bd5d9f8
1 parent c1dfbb4
commit bd5d9f8
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 8 deletions.
diff --git a/imp/lib/Ajax/Application/Handler/Dynamic.php b/imp/lib/Ajax/Application/Handler/Dynamic.php
@@ -1190,7 +1190,7 @@ public function sentMailList()
             $mbox_ob = $val->mbox_ob;
             $tmp = array(
                 'f' => $mbox_ob->display,
-                'l' => Horde_String::abbreviate(str_repeat(' ', 2 * $val->level) . $mbox_ob->basename, 30),
+                'l' => Horde_String::abbreviate(str_repeat(' ', 2 * $val->level) . $mbox_ob->display, 30),
                 'v' => $val->container ? '' : $mbox_ob->form_to
             );
             if ($tmp['f'] == $tmp['v']) {

diff --git a/imp/lib/Prefs/Special/Acl.php b/imp/lib/Prefs/Special/Acl.php
@@ -76,7 +76,6 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $view->hasacl = count($curr_acl);
         $view->mbox = $mbox->form_to;
         $view->options = new IMP_Ftree_Select(array(
-            'basename' => true,
             'iterator' => $iterator,
             'selected' => $mbox
         ));

diff --git a/imp/lib/Prefs/Special/ComposeTemplates.php b/imp/lib/Prefs/Special/ComposeTemplates.php
@@ -60,7 +60,6 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator->mboxes = array('INBOX');
 
         $view->mbox_flist = new IMP_Ftree_Select(array(
-            'basename' => true,
             'iterator' => $iterator,
             'new_mbox' => true,
             'selected' => IMP_Mailbox::getPref(IMP_Mailbox::MBOX_TEMPLATES)

diff --git a/imp/lib/Prefs/Special/Drafts.php b/imp/lib/Prefs/Special/Drafts.php
@@ -54,7 +54,6 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(
-            'basename' => true,
             'iterator' => $iterator,
             'new_mbox' => true,
             'selected' => IMP_Mailbox::getPref(IMP_Mailbox::MBOX_DRAFTS)

diff --git a/imp/lib/Prefs/Special/InitialPage.php b/imp/lib/Prefs/Special/InitialPage.php
@@ -52,7 +52,6 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $view->folder_page = IMP_Mailbox::formTo(IMP::INITIAL_FOLDERS);
         $view->folder_sel = ($initial_page == IMP::INITIAL_FOLDERS);
         $view->flist = new IMP_Ftree_Select(array(
-            'basename' => true,
             'inc_vfolder' => true,
             'iterator' => $iterator,
             'selected' => $initial_page

diff --git a/imp/lib/Prefs/Special/Sentmail.php b/imp/lib/Prefs/Special/Sentmail.php
@@ -65,7 +65,6 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(
-            'basename' => true,
             'iterator' => $iterator,
             'new_mbox' => true
         ));

diff --git a/imp/lib/Prefs/Special/Spam.php b/imp/lib/Prefs/Special/Spam.php
@@ -56,7 +56,6 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(
-            'basename' => true,
             'iterator' => $iterator,
             'new_mbox' => true,
             'selected' => IMP_Mailbox::getPref(IMP_Mailbox::MBOX_SPAM)

diff --git a/imp/lib/Prefs/Special/Trash.php b/imp/lib/Prefs/Special/Trash.php
@@ -59,7 +59,6 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(
-            'basename' => true,
             'iterator' => $iterator,
             'new_mbox' => true,
             'selected' => $trash