summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-13 09:05:18 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-13 09:05:18 +0200
commitcb29c97bf6cb5bbe79b17e7524a6042000f1a101 (patch)
tree6f590668ca6074ac7f85172d46faaf2e3dc7d857 /program/include
parent47fccf4fa667bb9caac0ee093df0fa8375b0db82 (diff)
Fix lack of translation of special folders in some configurations (#1489799)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php10
1 files changed, 5 insertions, 5 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');
}