diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcmail.php | 10 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 431b77284..7b663ca25 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1606,10 +1606,14 @@ class rcmail extends rcube * * @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) { $storage = $this->get_storage(); @@ -1628,10 +1632,6 @@ class rcmail extends rcube } } - if (!$realnames && ($folder_class = $this->folder_classname($name))) { - return $this->gettext($folder_class); - } - return rcube_charset::convert($name, 'UTF7-IMAP'); } diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index c123fe84a..027b2c142 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -146,7 +146,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { '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); |