Merge lp:~marcustomlinson/indicator-datetime/lp-1236400 into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

[Marcus Tomlinson]

Fixed datetime title text to read "Date and Time" rather than the day of the week (as per spec).

[Charles Kerr (charlesk)]

Looks good! Thanks for adding the weekday to the calendar menuitem.

review: Approve

[lp:~marcustomlinson/indicator-datetime/lp-1236400]

275. By Marcus Tomlinson on 2013-10-16

Fixed date formatted string menu item to display the full name of current day rather than the shortend version.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/indicator-datetime-autolanding/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-autolanding/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-autolanding/47
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-autolanding/47/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/indicator-datetime/lp-1236400]

276. By Marcus Tomlinson on 2013-10-16

Replace "Date and Time" menu title on phone with "Upcoming" according to updated spec.

[Charles Kerr (charlesk)]

Re-approving for Jenkins :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/service.c'
--- src/service.c	2013-10-16 14:50:25 +0000
+++ src/service.c	2013-10-16 16:35:28 +0000
@@ -522,7 +522,7 @@
   gchar * label;
   gboolean has_alarms;
   gchar * a11y;
-  gchar * title;
+  const gchar * title = _("Upcoming");
 
   g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
 
@@ -550,10 +550,7 @@
 
   g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE));
   g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label));
-
-  /* title is day-of-week */
-  title = g_date_time_format (now, _("%A"));
-  g_variant_builder_add (&b, "{sv}", "title", g_variant_new_take_string (title));
+  g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title));
 
   /* cleanup */
   g_date_time_unref (now);
@@ -686,7 +683,7 @@
   GMenu * menu = g_menu_new ();
 
   /* strftime(3) format string to show date */
-  add_localtime_menuitem (menu, self, _("%e %B %Y"), "calendar");
+  add_localtime_menuitem (menu, self, _("%A, %e %B %Y"), "calendar");
 
   return G_MENU_MODEL (menu);
 }