Copy localization updates for 0.4.2 release

thomascube

2010-10-06 2fe8d6bdebbaa160ee062b18e78fe7e77b430e00

 plugins/subscriptions_option/subscriptions_option.php

@@ -31,11 +31,11 @@
        $this->add_texts('localization/', false);
        $dont_override = rcmail::get_instance()->config->get('dont_override', array());
        if (!in_array('use_subscriptions', $dont_override)) {
            $this->add_hook('user_preferences', array($this, 'settings_blocks'));
            $this->add_hook('save_preferences', array($this, 'save_prefs'));
            $this->add_hook('preferences_list', array($this, 'settings_blocks'));
            $this->add_hook('preferences_save', array($this, 'save_prefs'));
        }
        $this->add_hook('list_mailboxes', array($this, 'list_mailboxes'));
        $this->add_hook('manage_folders', array($this, 'manage_folders'));
        $this->add_hook('mailboxes_list', array($this, 'mailboxes_list'));
        $this->add_hook('folders_list', array($this, 'folders_list'));
    }

    function settings_blocks($args)
@@ -72,16 +72,16 @@
        return $args;
    }

    function list_mailboxes($args)
    function mailboxes_list($args)
    {
        $rcmail = rcmail::get_instance();
        if (!$rcmail->config->get('use_subscriptions', true)) {
            $args['folders'] = iil_C_ListMailboxes($rcmail->imap->conn, $rcmail->imap->mod_mailbox($args['root']), $args['filter']);
            $args['folders'] = $rcmail->imap->conn->listMailboxes($rcmail->imap->mod_mailbox($args['root']), $args['filter']);
        }
        return $args;
    }

    function manage_folders($args)
    function folders_list($args)
    {
        $rcmail = rcmail::get_instance();
        if (!$rcmail->config->get('use_subscriptions', true)) {