diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcmail.php | 6 | ||||
| -rw-r--r-- | program/localization/en_GB/labels.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 14 | ||||
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 76edfab0b..a0bc03633 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1326,7 +1326,7 @@ class rcmail extends rcube $msgcounts = $this->storage->get_cache('messagecount'); $collapsed = $this->config->get('collapsed_folders'); - if ($this->config->get('show_actual_foldernames')) + if ($this->config->get('show_real_foldernames')) $realnames = true; $out = ''; @@ -1494,7 +1494,7 @@ class rcmail extends rcube if ($count > 1) { for ($i = 0; $i < $count; $i++) { $folder = implode($delimiter, array_slice($path, 0, -$i)); - if (!$this->config->get('show_actual_foldernames') && + if (!$this->config->get('show_real_foldernames') && ($folder_class = $this->folder_classname($folder))) { $name = implode($delimiter, array_slice($path, $count - $i)); return $this->gettext($folder_class) . $delimiter . rcube_charset::convert($name, 'UTF7-IMAP'); @@ -1503,7 +1503,7 @@ class rcmail extends rcube } } - if (!$this->config->get('show_actual_foldernames') && + if (!$this->config->get('show_real_foldernames') && ($folder_class = $this->folder_classname($name))) { return $this->gettext($folder_class); } diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc index 9052d2d4d..88e4cfd9c 100644 --- a/program/localization/en_GB/labels.inc +++ b/program/localization/en_GB/labels.inc @@ -37,7 +37,7 @@ $labels['drafts'] = 'Drafts'; $labels['sent'] = 'Sent'; $labels['trash'] = 'Deleted Items'; $labels['junk'] = 'Junk'; -$labels['show_actual_foldernames'] = 'Show actual names for special folders'; +$labels['show_real_foldernames'] = 'Show real names for special folders'; // message listing $labels['subject'] = 'Subject'; diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 62857ac88..2cbfed16c 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -771,16 +771,16 @@ function rcmail_user_prefs($current=null) ); - if (!isset($no_override['show_actual_foldernames'])) { - $field_id = 'show_actual_foldernames'; - $input_show_actual_foldernames = - new html_checkbox(array('name' => '_show_actual_foldernames', + if (!isset($no_override['show_real_foldernames'])) { + $field_id = 'show_real_foldernames'; + $input_show_real_foldernames = + new html_checkbox(array('name' => '_show_real_foldernames', 'id' => $field_id, 'value' => 1)); - $blocks['main']['options']['show_actul_foldernames'] = array( + $blocks['main']['options']['show_real_foldernames'] = array( 'title' => html::label($field_id, - Q(rcube_label('show_actual_foldernames'))), - 'content' => $input_show_actual_foldernames->show($config['show_actual_foldernames']?1:0), + Q(rcube_label('show_real_foldernames'))), + 'content' => $input_show_real_foldernames->show($config['show_real_foldernames']?1:0), ); } // Configure special folders diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index b471489a5..caaf6466c 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -119,8 +119,8 @@ switch ($CURR_SECTION) case 'folders': $a_user_prefs = array( - 'show_actual_foldernames' => - isset($_POST['_show_actual_foldernames']) ? TRUE : FALSE, + 'show_real_foldernames' => + isset($_POST['_show_real_foldernames']) ? TRUE : FALSE, 'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST, true), 'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST, true), 'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST, true), |