diff options
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | src/service.c | 4 | ||||
| -rw-r--r-- | src/utils.c | 10 | ||||
| -rw-r--r-- | src/utils.h | 2 |
4 files changed, 27 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 3ac0eaa..918b53c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +indicator-datetime (13.10.0+13.10.20131004-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Change the tablet time format string to remove leading zeroes from + the hour component of the time format (ie, H:MM rather than HH:MM). + (LP: #1234483) + * on the phone, show appointments at 1AM as '1 AM', clock times as + '1:00 AM'. (LP: #1220297) + * Update settings URL to settings:///system. (LP: #1231444) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 264 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 04 Oct 2013 02:29:26 +0000 + indicator-datetime (13.10.0+13.10.20130930-0ubuntu1) saucy; urgency=low [ Charles Kerr ] diff --git a/src/service.c b/src/service.c index 0be73f5..d50319e 100644 --- a/src/service.c +++ b/src/service.c @@ -498,7 +498,7 @@ create_phone_header_state (IndicatorDatetimeService * self) /* label */ now = indicator_datetime_service_get_localtime (self); - fmt = get_terse_time_format_string (now); + fmt = get_terse_header_time_format_string (); label = g_date_time_format (now, fmt); /* icon */ @@ -1283,7 +1283,7 @@ on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { - url_dispatch_send ("settings://system/time-date", NULL, NULL); + url_dispatch_send ("settings:///system/time-date", NULL, NULL); } static void diff --git a/src/utils.c b/src/utils.c index bbb24ac..60fd393 100644 --- a/src/utils.c +++ b/src/utils.c @@ -294,6 +294,13 @@ get_terse_date_format_string (date_proximity_t proximity) return fmt; } +const gchar* +get_terse_header_time_format_string (void) +{ + /* a strftime(3) fmt string for a H:MM 12 hour time, eg "6:59 PM" */ + return T_("%l:%M %p"); +} + const gchar * get_terse_time_format_string (GDateTime * time) { @@ -301,8 +308,7 @@ get_terse_time_format_string (GDateTime * time) if (g_date_time_get_minute (time) != 0) { - /* a strftime(3) fmt string for a H:MM 12 hour time, eg "6:59 PM" */ - fmt = T_("%l:%M %p"); + fmt = get_terse_header_time_format_string (); } else { diff --git a/src/utils.h b/src/utils.h index 31a12bc..24eddb6 100644 --- a/src/utils.h +++ b/src/utils.h @@ -45,6 +45,8 @@ gchar* join_date_and_time_format_strings (const char * date_fmt, const gchar * get_terse_time_format_string (GDateTime * time); +const gchar * get_terse_header_time_format_string (void); + const gchar * get_full_time_format_string (GSettings * settings); gchar * generate_terse_format_string_at_time (GDateTime * now, |