summaryrefslogtreecommitdiff
path: root/program
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:06:36 +0200
commit4c7daf5ceaea1bc48eff117e1abe642d13445857 (patch)
treee9e1d7d8f5c105dc5e8c20f87f92b0dd80d0fd4a /program
parentd9588ff2282ec93945a8b6865ddb30c66504ec3b (diff)
Fix lack of translation of special folders in some configurations (#1489799)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail.php10
-rw-r--r--program/steps/mail/func.inc2
2 files changed, 6 insertions, 6 deletions
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');
}
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index e93e2f600..d1ca2a6a4 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -127,7 +127,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);