diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/datetime-service.c | 6 | ||||
| -rw-r--r-- | src/settings-shared.h | 8 |
3 files changed, 13 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 177c7e2..b05f3f1 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 @@ -56,9 +56,8 @@ 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 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 bd9a9c9..eacce36 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -47,8 +47,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libical/icaltime.h> #include <cairo/cairo.h> -#include <oobs/oobs-timeconfig.h> - #include "datetime-interface.h" #include "dbus-shared.h" #include "settings-shared.h" @@ -254,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); diff --git a/src/settings-shared.h b/src/settings-shared.h index ef1183c..cdbb063 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -53,7 +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: 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 |