Fix lack of translation of special folders in some configurations (#1489799)

Aleksander Machniak

2014-04-13 cb29c97bf6cb5bbe79b17e7524a6042000f1a101

 program/include/rcmail.php

@@ -1606,9 +1606,13 @@
     *
     * @return string Localized folder name in UTF-8 encoding
     */
    public function localize_foldername($name, $with_path = true)
    public function localize_foldername($name, $with_path = false)
    {
        $realnames = $this->config->get('show_real_foldernames');

        if (!$realnames && ($folder_class = $this->folder_classname($name))) {
            return $this->gettext($folder_class);
        }

        // try to localize path of the folder
        if ($with_path && !$realnames) {
@@ -1626,10 +1630,6 @@
                    }
                }
            }
        }

        if (!$realnames && ($folder_class = $this->folder_classname($name))) {
            return $this->gettext($folder_class);
        }

        return rcube_charset::convert($name, 'UTF7-IMAP');