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

Proposed by Marcus Tomlinson on 2013-10-16
Status: Merged
Approved by: Francis Ginther on 2013-10-17
Approved revision: 276
Merged at revision: 276
Proposed branch: lp:~marcustomlinson/indicator-datetime/lp-1236400
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 33 lines (+3/-6)
1 file modified
src/service.c (+3/-6)
To merge this branch: bzr merge lp:~marcustomlinson/indicator-datetime/lp-1236400
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-10-17
Charles Kerr (community) 2013-10-16 Approve on 2013-10-16
Review via email: mp+191415@code.launchpad.net

Commit message

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

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

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

review: Approve
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.

review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

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)
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) wrote :

Re-approving for Jenkins :)

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.c'
2--- src/service.c 2013-10-16 14:50:25 +0000
3+++ src/service.c 2013-10-16 16:35:28 +0000
4@@ -522,7 +522,7 @@
5 gchar * label;
6 gboolean has_alarms;
7 gchar * a11y;
8- gchar * title;
9+ const gchar * title = _("Upcoming");
10
11 g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
12
13@@ -550,10 +550,7 @@
14
15 g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE));
16 g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label));
17-
18- /* title is day-of-week */
19- title = g_date_time_format (now, _("%A"));
20- g_variant_builder_add (&b, "{sv}", "title", g_variant_new_take_string (title));
21+ g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title));
22
23 /* cleanup */
24 g_date_time_unref (now);
25@@ -686,7 +683,7 @@
26 GMenu * menu = g_menu_new ();
27
28 /* strftime(3) format string to show date */
29- add_localtime_menuitem (menu, self, _("%e %B %Y"), "calendar");
30+ add_localtime_menuitem (menu, self, _("%A, %e %B %Y"), "calendar");
31
32 return G_MENU_MODEL (menu);
33 }

Subscribers

People subscribed via source and target branches