Internationalized Folder/Subfolder in Selection List Style option

[squirrelmail.git] / include / options / folder.php

diff --git a/include/options/folder.php b/include/options/folder.php
index a84952b09230b14bba57b4d3918cfb44035f4e7c..128aee65239b5c82d1e143b9fa8a1e7d11137d62 100644 (file)
--- a/include/options/folder.php
+++ b/include/options/folder.php
@@ -3,7 +3,7 @@
 /**
  * options_folder.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Displays all options relating to folders
@@ -29,7 +29,6 @@ function load_optpage_data_folder() {
     $imapConnection =
         sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
     $boxes = sqimap_mailbox_list($imapConnection);
-    sqimap_logout($imapConnection);
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -209,15 +208,15 @@ function load_optpage_data_folder() {
     $optgrps[SMOPT_GRP_FOLDERSELECT] = _("Folder Selection Options");
     $optvals[SMOPT_GRP_FOLDERSELECT] = array();
 
-    $delim = sqimap_get_delimiter();
+    $delim = sqimap_get_delimiter($imapConnection);
     $optvals[SMOPT_GRP_FOLDERSELECT][] = array(
         'name'    => 'mailbox_select_style',
         'caption' => _("Selection List Style"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'posvals' => array( 0 => _("Long: ") . '"Folder' . $delim . 'Subfolder"',
-                            1 => _("Indented: ") .  '"    ' . 'Subfolder"',
-                            2 => _("Delimited: ") . '". ' . 'Subfolder"')
+        'posvals' => array( 0 => _("Long: ") . '"' . _("Folder") . $delim . _("Subfolder") . '"',
+                            1 => _("Indented: ") .  '"    ' . _("Subfolder") . '"',
+                            2 => _("Delimited: ") . '". ' . _("Subfolder") . '"')
     );
 
     /* Assemble all this together and return it as our result. */
@@ -225,6 +224,7 @@ function load_optpage_data_folder() {
         'grps' => $optgrps,
         'vals' => $optvals
     );
+    sqimap_logout($imapConnection);
     return ($result);
 }