diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/main.inc | 16 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 2d28090c7..06cf706ea 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1844,4 +1844,20 @@ function rcmail_folder_classname($folder_id) } +/** + * Try to localize the given IMAP folder name. + * UTF-7 decode it in case no localized text was found + * + * @param string Folder name + * @return string Localized folder name in UTF-8 encoding + */ +function rcmail_localize_foldername($name) +{ + if ($folder_class = rcmail_folder_classname($name)) + return rcube_label($folder_class); + else + return rcube_charset_convert($name, 'UTF-7'); +} + + ?> diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 5156e0232..f14c532b4 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -76,7 +76,7 @@ if (!$OUTPUT->ajax_call) // set page title if (empty($_action) || $_action == 'list') - $OUTPUT->set_pagetitle(rcube_charset_convert($IMAP->get_mailbox_name(), 'UTF-7')); + $OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->get_mailbox_name())); |