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

Aleksander Machniak

2014-04-13 4c7daf5ceaea1bc48eff117e1abe642d13445857

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

 CHANGELOG

@@ -6,6 +6,7 @@
- Fix "washing" of unicoded style attributes (#1489777)
- Fix unintentional redirect from compose page in Webkit browsers (#1489789)
- Fix messages index cache update under some conditions (e.g. proxy) (#1489756)
- Fix lack of translation of special folders in some configurations (#1489799)

RELEASE 1.0.0
-------------

 program/include/rcmail.php

@@ -1621,9 +1621,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) {
@@ -1641,10 +1645,6 @@
                    }
                }
            }
        }

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

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

 program/steps/mail/func.inc

@@ -127,7 +127,7 @@
            'copy', 'move', 'quota', 'replyall', 'replylist');
    }

    $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
    $pagetitle = $RCMAIL->localize_foldername($mbox_name, true);
    $pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);

    $OUTPUT->set_pagetitle($pagetitle);