diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-06 08:27:48 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-06 08:27:48 -0500 |
| commit | d917059da2646f519e5007ab1bd80dca8d4a1d5c (patch) | |
| tree | 04c1e953686eb87fec1388f50764975343e6894b | |
| parent | 7d3e15037161dd727a6855e393eb3cb86cf91e72 (diff) | |
| parent | 6549c4060168870fcbd53c3c5f9c3c596ac641f9 (diff) | |
| download | ayatana-indicator-datetime-d917059da2646f519e5007ab1bd80dca8d4a1d5c.tar.gz ayatana-indicator-datetime-d917059da2646f519e5007ab1bd80dca8d4a1d5c.tar.bz2 ayatana-indicator-datetime-d917059da2646f519e5007ab1bd80dca8d4a1d5c.zip | |
* Upstream Merge
* Give full day events the day name instead of a time
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/datetime-service.c | 44 |
2 files changed, 39 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 9f9fe05..7a987a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.2.1-0ubuntu2~ppa2) UNRELEASED; urgency=low + + * Upstream Merge + * Give full day events the day name instead of a time + + -- Ted Gould <ted@ubuntu.com> Wed, 06 Apr 2011 08:27:25 -0500 + indicator-datetime (0.2.1-0ubuntu2~ppa1) natty; urgency=low * Upstream Merge diff --git a/src/datetime-service.c b/src/datetime-service.c index 6458ae9..5e8d312 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -802,9 +802,10 @@ update_appointment_menu_items (gpointer user_data) DbusmenuMenuitem * item; ECalComponentVType vtype = e_cal_component_get_vtype (ecalcomp); + struct tm due_data = {0}; struct tm *due = NULL; - if (vtype == E_CAL_COMPONENT_EVENT) due = localtime(&ci->start); - else if (vtype == E_CAL_COMPONENT_TODO) due = localtime(&ci->end); + if (vtype == E_CAL_COMPONENT_EVENT) due = localtime_r(&ci->start, &due_data); + else if (vtype == E_CAL_COMPONENT_TODO) due = localtime_r(&ci->end, &due_data); else continue; const int dmday = due->tm_mday; @@ -859,17 +860,36 @@ update_appointment_menu_items (gpointer user_data) g_debug("Summary: %s", summary); g_free (summary); + gboolean full_day = FALSE; + if (vtype == E_CAL_COMPONENT_EVENT) { + time_t start = ci->start; + if (time_add_day(start, 1) == ci->end) { + full_day = TRUE; + } + } + // Due text - if (apt_output == SETTINGS_TIME_12_HOUR) { - if ((mday == dmday) && (mon == dmon) && (year == dyear)) - strftime(right, 20, _(DEFAULT_TIME_12_FORMAT), due); - else - strftime(right, 20, _(DEFAULT_TIME_12_FORMAT_WITH_DAY), due); - } else if (apt_output == SETTINGS_TIME_24_HOUR) { - if ((mday == dmday) && (mon == dmon) && (year == dyear)) - strftime(right, 20, _(DEFAULT_TIME_24_FORMAT), due); - else - strftime(right, 20, _(DEFAULT_TIME_24_FORMAT_WITH_DAY), due); + if (full_day) { + struct tm fulldaytime = {0}; + gmtime_r(&ci->start, &fulldaytime); + + /* TRANSLATORS: This is a strftime string for the day for full day events + in the menu. It should most likely be either '%A' for a full text day + (Wednesday) or '%a' for a shortened one (Wed). You should only need to + change for '%a' in the case of langauges with very long day names. */ + strftime(right, 20, _("%A"), &fulldaytime); + } else { + if (apt_output == SETTINGS_TIME_12_HOUR) { + if ((mday == dmday) && (mon == dmon) && (year == dyear)) + strftime(right, 20, _(DEFAULT_TIME_12_FORMAT), due); + else + strftime(right, 20, _(DEFAULT_TIME_12_FORMAT_WITH_DAY), due); + } else if (apt_output == SETTINGS_TIME_24_HOUR) { + if ((mday == dmday) && (mon == dmon) && (year == dyear)) + strftime(right, 20, _(DEFAULT_TIME_24_FORMAT), due); + else + strftime(right, 20, _(DEFAULT_TIME_24_FORMAT_WITH_DAY), due); + } } g_debug("Appointment time: %s, for date %s", right, asctime(due)); dbusmenu_menuitem_property_set (item, APPOINTMENT_MENUITEM_PROP_RIGHT, right); |