From 095bf2692ce36c1197349a629dde3c714c845384 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 29 Mar 2011 17:22:14 -0300 Subject: remember user's preferred location name for main timezone --- src/settings-shared.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings-shared.h') diff --git a/src/settings-shared.h b/src/settings-shared.h index cdbb063..1ad4799 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -34,6 +34,7 @@ with this program. If not, see . #define SETTINGS_SHOW_EVENTS_S "show-events" #define SETTINGS_SHOW_LOCATIONS_S "show-locations" #define SETTINGS_LOCATIONS_S "locations" +#define SETTINGS_TIMEZONE_NAME_S "timezone-name" enum { SETTINGS_TIME_LOCALE = 0, -- cgit v1.2.3 From b690f64445e81b5ce09f5b1eb7b56defb64bbba4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Mar 2011 16:06:05 -0500 Subject: Setting the default _WITH_DAY to be 12_WITH_DAY --- src/datetime-service.c | 2 +- src/settings-shared.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/settings-shared.h') diff --git a/src/datetime-service.c b/src/datetime-service.c index fb3b89f..5172eea 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -654,7 +654,7 @@ update_appointment_menu_items (gpointer user_data) const int mday = today->tm_mday; const int mon = today->tm_mon; const int year = today->tm_year; - + struct tm *start_tm = NULL; int this_year = today->tm_year + 1900; int days[12]={31,28,31,30,31,30,31,31,30,31,30,31}; diff --git a/src/settings-shared.h b/src/settings-shared.h index cdbb063..47ee6ef 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -51,7 +51,7 @@ enum { #define DEFAULT_TIME_24_FORMAT N_("%H:%M") #define DEFAULT_TIME_FORMAT DEFAULT_TIME_12_FORMAT -#define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT +#define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT_WITH_DAY /* TRANSLATORS: A format string for the strftime function for a clock showing the day of the week and the time in 12-hour format without -- cgit v1.2.3 From e8d074ffc39904e5095623c8c865e32a1fffecc8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Mar 2011 16:50:04 -0500 Subject: Be a bit smarter about handling the the locale --- src/datetime-service.c | 11 +++++------ src/settings-shared.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/settings-shared.h') diff --git a/src/datetime-service.c b/src/datetime-service.c index 5172eea..9eb26e8 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -749,7 +749,11 @@ update_appointment_menu_items (gpointer user_data) } else if (g_strcmp0(time_format_str, "24-hour") == 0) { apt_output = SETTINGS_TIME_24_HOUR; } else { - apt_output = SETTINGS_TIME_LOCALE; + if (is_locale_12h()) { + apt_output = SETTINGS_TIME_12_HOUR; + } else { + apt_output = SETTINGS_TIME_24_HOUR; + } } GVariantBuilder markeddays; @@ -833,11 +837,6 @@ update_appointment_menu_items (gpointer user_data) strftime(right, 20, _(DEFAULT_TIME_24_FORMAT), due); else strftime(right, 20, _(DEFAULT_TIME_24_FORMAT_WITH_DAY), due); - } else { - if ((mday == dmday) && (mon == dmon) && (year == dyear)) - strftime(right, 20, _(DEFAULT_TIME_FORMAT), due); - else - strftime(right, 20, _(DEFAULT_TIME_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); diff --git a/src/settings-shared.h b/src/settings-shared.h index 47ee6ef..8c36ae3 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -50,7 +50,7 @@ enum { a clock showing 24-hour time without seconds. */ #define DEFAULT_TIME_24_FORMAT N_("%H:%M") -#define DEFAULT_TIME_FORMAT DEFAULT_TIME_12_FORMAT +#define DEFAULT_TIME_FORMAT DEFAULT_TIME_12_FORMAT #define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT_WITH_DAY /* TRANSLATORS: A format string for the strftime function for -- cgit v1.2.3