2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/calendar.php |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 60dbc1f5c9f0dec764cca21efd6999430f930b96
Merge: ac66c5b 7cd68bb
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Fri Aug 3 15:29:52 2012 +0200

    Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube



commit ac66c5b3d09cb122c21b950a874eca7678028fc9
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Fri Aug 3 15:29:38 2012 +0200

    Make alarms_text() public static and thus available for tasklist plugin

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 02c2ae9..5061f20 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1148,7 +1148,7 @@ class calendar extends rcube_plugin
   {
     // compose a human readable strings for alarms_text and recurrence_text
     if ($event['alarms'])
-      $event['alarms_text'] = $this->_alarms_text($event['alarms']);
+      $event['alarms_text'] = self::alarms_text($event['alarms']);
     if ($event['recurrence']) {
       $event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);
       if ($event['recurrence']['UNTIL'])
@@ -1196,25 +1196,25 @@ class calendar extends rcube_plugin
   /**
    * Render localized text for alarm settings
    */
-  private function _alarms_text($alarm)
+  public static function alarms_text($alarm)
   {
     list($trigger, $action) = explode(':', $alarm);
     
     $text = '';
     switch ($action) {
       case 'EMAIL':
-        $text = $this->gettext('alarmemail');
+        $text = rcube_label('calendar.alarmemail');
         break;
       case 'DISPLAY':
-        $text = $this->gettext('alarmdisplay');
+        $text = rcube_label('calendar.alarmdisplay');
         break;
     }
     
     if (preg_match('/@(\d+)/', $trigger, $m)) {
-      $text .= ' ' . $this->gettext(array('name' => 'alarmat', 'vars' => array('datetime' => format_date($m[1]))));
+      $text .= ' ' . rcube_label(array('name' => 'calendar.alarmat', 'vars' => array('datetime' => format_date($m[1]))));
     }
     else if ($val = self::parse_alaram_value($trigger)) {
-      $text .= ' ' . intval($val[0]) . ' ' . $this->gettext('trigger' . $val[1]);
+      $text .= ' ' . intval($val[0]) . ' ' . rcube_label('calendar.trigger' . $val[1]);
     }
     else
       return false;