From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Mon, 22 Nov 2010 00:31:18 +0000 (-0500)
Subject: Weekday data in recursion object is given as a MASK_* constant,
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=780163d95e9fac961ae89ff2e823fb342597bb29;p=horde.git

Weekday data in recursion object is given as a MASK_* constant,
not a DATE_* constant.
---

diff --git a/kronolith/js/mobile.js b/kronolith/js/mobile.js
index 7eae72fd9..3c6707086 100644
--- a/kronolith/js/mobile.js
+++ b/kronolith/js/mobile.js
@@ -288,57 +288,51 @@
      */
     buildEventView: function(e)
     {
-         var list = $('<ul>').addClass('kronolithEventDetail').attr({'data-role': 'listview', 'data-inset': true});
-         var loc = false, t, recur;
-
-         // Title and location
-         var title = $('<div>').addClass('kronolithEventDetailTitle').append($('<h2>').text(e.t));
-         var calendar = $('<p>').addClass('kronolithEventDetailCalendar').text(Kronolith.conf.calendars[e.ty][e.c]['name']);
-
-         // Time
-         t = $('<li>');
+         var list = $('<ul>')
+            .addClass('kronolithEventDetail')
+            .attr({'data-role': 'listview', 'data-inset': true}),
+         loc = false,
+         title = $('<div>').addClass('kronolithEventDetailTitle').append($('<h2>').text(e.t)),
+         calendar = $('<p>').addClass('kronolithEventDetailCalendar').text(Kronolith.conf.calendars[e.ty][e.c]['name']);
+         var item = $('<div>');
          if (e.r) {
+             var recurText = Kronolith.text.recur.desc[e.r.t][(e.r.i > 1) ? 1 : 0];
+             var date = Date.parse(e.s);
              switch (e.r.t) {
              case 1:
                  // Daily
-                 t.append($('<div>').addClass('kronolithEventDetailRecurring').text(Kronolith.text.recur[e.r.t]));
+                 recurText = Kronolith.text.recur[e.r.t];
                  break;
              case 2:
                  // Weekly
-                 recur = Kronolith.text.recur.desc[e.r.t][(e.r.i > 1) ? 1 : 0];
-                 recur = recur.replace('#{weekday}', Kronolith.text.weekday[e.r.d]);
-                 recur = recur.replace('#{interval}', e.r.i);
-                 t.append($('<div>').addClass('kronolithEventDetailRecurring').append(recur));
+                 recurText = recurText.replace('#{weekday}', Kronolith.text.weekday[e.r.d]);
+                 recurText = recurText.replace('#{interval}', e.r.i);
                  break;
              case 3:
                  // Monthly_Date
-                 recur = Kronolith.text.recur.desc[e.r.t][(e.r.i > 1) ? 1 : 0];
-                 var s = Date.parse(e.s);
-                 recur = recur.replace('#{date}', s.toString('dS'));
-                 recur = recur.replace('#{interval}', e.r.i);
-                 t.append($('<div>').addClass('kronolithEventDetailRecurring').append(recur));
-                 break;
+                 recuText = recurText.replace('#{date}', date.toString('dS'));
+                 // Fall-thru
              case 4:
+             case 5:
                  // Monthly_Day
-                 recur = Kronolith.text.recur.desc[e.r.t][(e.r.i > 1) ? 1 : 0];
-                 recur = recur.replace('#{interval}', e.r.i);
+                 recurText = recurText.replace('#{interval}', e.r.i);
                  break;
-             case 5:
              case 6:
              case 7:
              default:
-                 t.text('TODO');
+                 recurText = 'todo';
              }
-             t.append($('<div>').addClass('kronolithEventDetailRecurring').text(Kronolith.text.recur[e.r.t]));
+             item.append($('<div>').addClass('kronolithEventDetailRecurring').append(recurText));
+             item.append($('<div>').addClass('kronolithEventDetailRecurring').text(Kronolith.text.recur[e.r.t]));
          } else if (e.al) {
-             t.append($('<div>').addClass('kronolithEventDetailAllDay').text(Kronolith.text.allday));
+             item.append($('<div>').addClass('kronolithEventDetailAllDay').text(Kronolith.text.allday));
          } else {
-             t.append($('<div>')
+             item.append($('<div>')
                 .append($('<div>').addClass('kronolithEventDetailDate').text(Date.parse(e.s).toString('D'))
                 .append($('<div>').addClass('kronolithEventDetailTime').text(Date.parse(e.s).toString(Kronolith.conf.time_format) + ' - ' + Date.parse(e.e).toString(Kronolith.conf.time_format))))
              );
          }
-         list.append($('<li>').append(title).append(calendar).append(t));
+         list.append($('<li>').append(title).append(calendar).append(item));
 
          // Location
          if (e.gl) {
diff --git a/kronolith/templates/mobile/javascript_defs.php b/kronolith/templates/mobile/javascript_defs.php
index 41e03b0d9..64a9ba3b5 100644
--- a/kronolith/templates/mobile/javascript_defs.php
+++ b/kronolith/templates/mobile/javascript_defs.php
@@ -17,7 +17,7 @@ $code['conf'] = array(
         'exception' => (string)Horde_Themes::img('exception-fff.png'),
     ),
     'user' => $GLOBALS['registry']->convertUsername($GLOBALS['registry']->getAuth(), false),
-    //'prefs_url' => (string)Horde::getServiceLink('prefs', 'kronolith')->setRaw(true)->add('ajaxui', 1),
+    'prefs_url' => (string)Horde::getServiceLink('prefs', 'kronolith')->setRaw(true)->add('ajaxui', 1),
     'name' => $registry->get('name'),
     'has_tasks' => $has_tasks,
     'default_calendar' => 'internal|' . Kronolith::getDefaultCalendar(Horde_Perms::EDIT),
@@ -153,41 +153,37 @@ foreach ($GLOBALS['all_holidays'] as $id => $calendar) {
 /* Gettext strings used in core javascript files. */
 $code['text'] = array(
     'ajax_error' => _("Error when communicating with the server."),
-    //'alarm' => _("Alarm:"),
-    //'snooze' => sprintf(_("You can snooze it for %s or %s dismiss %s it entirely"), '#{time}', '#{dismiss_start}', '#{dismiss_end}'),
-    //'agenda' => _("Agenda"),
     'allday' => _("All day"),
-    //'more' => _("more..."),
-    //'prefs' => _("Preferences"),
-    //'shared' => _("Shared"),
-    //'fix_form_values' => _("Please enter correct values in the form first."),
     'noevents' => _("No events to display"),
     'yesterday' => _("Yesterday"),
     'today' => _("Today"),
     'tomorrow' => _("Tomorrow")
 );
-for ($i = 1; $i <= 12; ++$i) {
-    $code['text']['month'][$i - 1] = Horde_Nls::getLangInfo(constant('MON_' . $i));
-}
-for ($i = 1; $i <= 7; ++$i) {
-    $code['text']['weekday'][$i] = Horde_Nls::getLangInfo(constant('DAY_' . $i));
+
+/* Map day masks to localized day names for recursion */
+$masks = array(
+    Horde_Date::MASK_SUNDAY => Horde_Nls::getLangInfo(DAY_1),
+    Horde_Date::MASK_MONDAY => Horde_Nls::getLangInfo(DAY_2),
+    Horde_Date::MASK_TUESDAY => Horde_Nls::getLangInfo(DAY_3),
+    Horde_Date::MASK_WEDNESDAY => Horde_Nls::getLangInfo(DAY_4),
+    Horde_Date::MASK_THURSDAY => Horde_Nls::getLangInfo(DAY_5),
+    Horde_Date::MASK_FRIDAY => Horde_Nls::getLangInfo(DAY_6),
+    Horde_Date::MASK_SATURDAY => Horde_Nls::getLangInfo(DAY_7));
+foreach ($masks as $i => $text) {
+    $code['text']['weekday'][$i] = $text;
 }
-//foreach (array(Horde_Date_Recurrence::RECUR_DAILY,
-//               Horde_Date_Recurrence::RECUR_WEEKLY,
-//               Horde_Date_Recurrence::RECUR_MONTHLY_DATE,
-//               Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY,
-//               Horde_Date_Recurrence::RECUR_YEARLY_DATE,
-//               Horde_Date_Recurrence::RECUR_YEARLY_DAY,
-//               Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY) as $recurType) {
-//    $code['text']['recur'][$recurType] = Kronolith::recurToString($recurType);
-//}
+
 $code['text']['recur']['desc'] = array(
     Horde_Date_Recurrence::RECUR_WEEKLY => array(sprintf(_("Recurs weekly on every %s"), "#{weekday}"),
                                                  sprintf(_("Recurs every %s weeks on %s"), "#{interval}", "#{weekday}")),
     Horde_Date_Recurrence::RECUR_MONTHLY_DATE => array(sprintf(_("Recurs on the %s of every month"), "#{date}"),
                                                        sprintf(_("Recurs every %s months on the %s"), "#{interval}", "#{date}")),
     Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY => array(_("Recurs every month on the same weekday"),
-                                                       sprintf(_("Recurs every %s months on the same weekday"), "#{interval}"))
+                                                       sprintf(_("Recurs every %s months on the same weekday"), "#{interval}")),
+    Horde_Date_Recurrence::RECUR_YEARLY_DATE => array(sprintf(_("Recurs once a year, on %s"), '#{date}'),
+                                                      sprintf(_("Recurs every %s years on %s"), '#{interval}', '#{date}')),
+    Horde_Date_Recurrence::RECUR_YEARLY_DAY => array(_("Recurs once a year, on the same day"),
+                                                      sprintf(_("Recurs every %s years on the same day"), '#{interval}'))
 );
 $code['text']['recur']['exception'] = _("Exception");