From 4c7daf5ceaea1bc48eff117e1abe642d13445857 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 13 Apr 2014 09:05:18 +0200 Subject: Fix lack of translation of special folders in some configurations (#1489799) --- program/include/rcmail.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'program/include/rcmail.php') diff --git a/program/include/rcmail.php b/program/include/rcmail.php index e558ce8e6..ca944f447 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1621,10 +1621,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(); @@ -1643,10 +1647,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'); } -- cgit v1.2.3