From da12c2831436855897428f7d5063626193d72562 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 16:03:58 -0500 Subject: Updating to required IDO version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 177c7e2..75d1ff1 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 DBUSMENUGTK_REQUIRED_VERSION=0.3.94 GIO_REQUIRED_VERSION=2.25.11 # Note: the GIO check below also ensures the proper glib with gsettings support is present -INDICATOR_DISPLAY_OBJECTS=0.1.10 +INDICATOR_DISPLAY_OBJECTS=0.2.2 GEOCLUE_REQUIRED_VERSION=0.12.0 OOBS_REQUIRED_VERSION=2.31.0 ECAL_REQUIRED_VERSION=2.30 -- cgit v1.2.3 From 3c59d0869955b4c0698d7a563d712b357e0a2cd9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 16:04:08 -0500 Subject: 0.1.98 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 75d1ff1..88c7b20 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-datetime, 0.1.97, ted@canonical.com) +AC_INIT(indicator-datetime, 0.1.98, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-datetime, 0.1.97) +AM_INIT_AUTOMAKE(indicator-datetime, 0.1.98) AM_MAINTAINER_MODE -- cgit v1.2.3 From 5f78edb1e798eb7b8257c212163442a49d60be8f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 16:47:51 -0500 Subject: Sadly, no more oobs for us. --- configure.ac | 3 --- src/datetime-service.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 88c7b20..b05f3f1 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,6 @@ GIO_REQUIRED_VERSION=2.25.11 # Note: the GIO check below also ensures the proper glib with gsettings support is present INDICATOR_DISPLAY_OBJECTS=0.2.2 GEOCLUE_REQUIRED_VERSION=0.12.0 -OOBS_REQUIRED_VERSION=2.31.0 ECAL_REQUIRED_VERSION=2.30 EDS_REQUIRED_VERSION=2.30 ICAL_REQUIRED_VERSION=0.44 @@ -93,7 +92,6 @@ AS_IF([test "x$with_gtk" = x3], libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS gio-2.0 >= $GIO_REQUIRED_VERSION geoclue >= $GEOCLUE_REQUIRED_VERSION - liboobs-1 >= $OOBS_REQUIRED_VERSION libecal-1.2 >= $ECAL_REQUIRED_VERSION libical >= $ICAL_REQUIRED_VERSION libedataserver-1.2 >= EDS_REQUIRED_VERSION @@ -109,7 +107,6 @@ AS_IF([test "x$with_gtk" = x3], libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS gio-2.0 >= $GIO_REQUIRED_VERSION geoclue >= $GEOCLUE_REQUIRED_VERSION - liboobs-1 >= $OOBS_REQUIRED_VERSION libecal-1.2 >= $ECAL_REQUIRED_VERSION libical >= $ICAL_REQUIRED_VERSION libedataserver-1.2 >= EDS_REQUIRED_VERSION diff --git a/src/datetime-service.c b/src/datetime-service.c index 18fa583..615010c 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -47,8 +47,6 @@ with this program. If not, see . #include #include -#include - #include "datetime-interface.h" #include "dbus-shared.h" #include "settings-shared.h" -- cgit v1.2.3 From 847357e2b3d41d10b8971c9714326def74dcbc61 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 20 Mar 2011 22:08:35 -0500 Subject: Translator comment from answers --- src/settings-shared.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/settings-shared.h b/src/settings-shared.h index ef1183c..0fee4b7 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -54,6 +54,8 @@ enum { #define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT #define DEFAULT_TIME_12_FORMAT_WITH_DAY N_("%a %l:%M %p") +/* TRANSLATORS: Information is available in this Launchpad + answer: https://answers.launchpad.net/ubuntu/+source/indicator-datetime/+question/149752 */ #define DEFAULT_TIME_24_FORMAT_WITH_DAY N_("%a %H:%M") #endif -- cgit v1.2.3 From 13c3a183a9e32d5e0e115038d4bb62c26b0d81db Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 21 Mar 2011 15:13:07 +0100 Subject: Mark date format string as translatable, and add translator comment. Fixes: LP:737326 --- src/datetime-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 615010c..8b5e5b6 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -252,8 +252,8 @@ update_datetime (gpointer user_data) return FALSE; } - /* Note: may require some localization tweaks */ - strftime(longstr, 128, "%A, %e %B %Y", ltime); + /* Translators: strftime(3) style date format on top of the menu when you click on the clock */ + strftime(longstr, 128, _("%A, %e %B %Y"), ltime); gchar * utf8 = g_locale_to_utf8(longstr, -1, NULL, NULL, NULL); dbusmenu_menuitem_property_set(date, DBUSMENU_MENUITEM_PROP_LABEL, utf8); -- cgit v1.2.3 From e3b43db557ce398bea7c6e62ca820c2af947c6bd Mon Sep 17 00:00:00 2001 From: David Planella Date: Mon, 21 Mar 2011 19:17:44 +0100 Subject: Added translator comments to strftime strings --- src/settings-shared.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/settings-shared.h b/src/settings-shared.h index 0fee4b7..cdbb063 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -53,9 +53,15 @@ enum { #define DEFAULT_TIME_FORMAT DEFAULT_TIME_12_FORMAT #define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT +/* 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 + seconds. */ #define DEFAULT_TIME_12_FORMAT_WITH_DAY N_("%a %l:%M %p") -/* TRANSLATORS: Information is available in this Launchpad - answer: https://answers.launchpad.net/ubuntu/+source/indicator-datetime/+question/149752 */ + +/* TRANSLATORS: A format string for the strftime function for + a clock showing the day of the week and the time in 24-hour format without + seconds. Information is available in this Launchpad answer: + https://answers.launchpad.net/ubuntu/+source/indicator-datetime/+question/149752 */ #define DEFAULT_TIME_24_FORMAT_WITH_DAY N_("%a %H:%M") #endif -- cgit v1.2.3 From 890d5bb440d7a5f73b4f9e6af62102a4844dcfda Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Wed, 23 Mar 2011 12:03:21 +0000 Subject: String change and small behaviour change mpt tagged "sniffles" --- src/datetime-service.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index eacce36..65df77e 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -371,11 +371,15 @@ check_for_calendar (gpointer user_data) dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); + dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); + g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, + G_CALLBACK (activate_cb), "evolution -c calendar"); + events_separator = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set(events_separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); dbusmenu_menuitem_child_add_position(root, events_separator, 2); add_appointment = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Appointment")); + dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event...")); dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); g_signal_connect(G_OBJECT(add_appointment), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "evolution -c calendar"); dbusmenu_menuitem_child_add_position (root, add_appointment, 3); -- cgit v1.2.3 From 445b748be0786f2d5ba9d469490bce7d277d653d Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Wed, 23 Mar 2011 12:20:47 +0000 Subject: Date and time -> Date and month *sniffles* --- data/datetime-dialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui index 7ec485f..7545227 100644 --- a/data/datetime-dialog.ui +++ b/data/datetime-dialog.ui @@ -474,7 +474,7 @@ - _Date and time + _Date and month True True False -- cgit v1.2.3 From 74fe3165a907c7e7948c7a2066188eda2f234b59 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Wed, 23 Mar 2011 12:25:12 +0000 Subject: Removed comma from date time indicator --- src/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.c b/src/utils.c index 7471926..6580f3b 100644 --- a/src/utils.c +++ b/src/utils.c @@ -183,7 +183,7 @@ generate_format_string_full (gboolean show_day, gboolean show_date) /* TRANSLATORS: This is a format string passed to strftime to combine the date and the time. The value of "%s, %s" would result in a string like this in US English 12-hour time: 'Fri Jul 16, 11:50 AM' */ - return g_strdup_printf(T_("%s, %s"), date_string, time_string); + return g_strdup_printf(T_("%s %s"), date_string, time_string); } gchar * -- cgit v1.2.3