From da81fb47cc555ede4289ecdc3c8e80b1b81949e6 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sun, 16 Aug 2009 23:13:16 -0600 Subject: [PATCH] Use Horde_LoginTasks::getLabels() --- imp/config/prefs.php.dist | 15 +++------------ kronolith/config/prefs.php.dist | 7 +------ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist index e620ecd52..0f4ef501d 100644 --- a/imp/config/prefs.php.dist +++ b/imp/config/prefs.php.dist @@ -379,15 +379,6 @@ $_prefs['acl'] = array( // Login Tasks preferences -// Listing of Horde_LoginTasks constants -> strings -$logintasks_labels = array( - Horde_LoginTasks::YEARLY => _("Yearly"), - Horde_LoginTasks::MONTHLY => _("Monthly"), - Horde_LoginTasks::WEEKLY => _("Weekly"), - Horde_LoginTasks::DAILY => _("Daily"), - Horde_LoginTasks::EVERY => _("Every Login") -); - // select widget for the initial_page preference $_prefs['initialpageselect'] = array('type' => 'special'); @@ -441,7 +432,7 @@ $_prefs['purge_sentmail_interval'] = array( 'locked' => false, 'shared' => false, 'type' => 'enum', - 'enum' => $logintasks_labels, + 'enum' => Horde_LoginTasks::getLabels(), 'desc' => _("Purge sent-mail how often:"), 'help' => 'prefs-purge_sentmail_interval'); @@ -487,7 +478,7 @@ $_prefs['purge_spam_interval'] = array( 'locked' => false, 'shared' => false, 'type' => 'enum', - 'enum' => $logintasks_labels, + 'enum' => Horde_LoginTasks::getLabels(), 'desc' => _("Purge Spam how often:"), 'help' => 'prefs-purge_spam_interval'); @@ -515,7 +506,7 @@ $_prefs['purge_trash_interval'] = array( 'locked' => false, 'shared' => false, 'type' => 'enum', - 'enum' => $logintasks_labels, + 'enum' => Horde_LoginTasks::getLabels(), 'desc' => _("Purge Trash how often:"), 'help' => 'prefs-purge_trash_interval'); diff --git a/kronolith/config/prefs.php.dist b/kronolith/config/prefs.php.dist index bf844ed71..329aa4809 100644 --- a/kronolith/config/prefs.php.dist +++ b/kronolith/config/prefs.php.dist @@ -420,12 +420,7 @@ $_prefs['purge_events_interval'] = array( 'locked' => false, 'shared' => false, 'type' => 'enum', - 'enum' => array( - Horde_LoginTasks::YEARLY => _("Yearly"), - Horde_LoginTasks::MONTHLY => _("Monthly"), - Horde_LoginTasks::WEEKLY => _("Weekly"), - Horde_LoginTasks::DAILY => _("Daily"), - Horde_LoginTasks::EVERY => _("Every Login")), + 'enum' => Horde_LoginTasks::getLabels(), 'desc' => _("Purge old events how often:"), ); -- 2.11.0