Changeset 1119 in subversion

Timestamp:

Feb 19, 2008 6:09:20 PM (5 years ago)

Author:

thomasb

Message:

Localize folder name in page title (#1484785)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/02/20 (thomasb)
+----------
+- Localize folder name in page title (#1484785)
 
 2008/02/12 (estadtherr)

trunk/roundcubemail/program/include/main.inc

@@ -1845 +1845 @@
 
 
+/**
+ * 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');
+}
+
+
 ?>

trunk/roundcubemail/program/steps/mail/func.inc

@@ -77 +77 @@
 // 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()));