diff options
| author | Didier Roche <didier.roche@canonical.com> | 2010-09-30 16:09:37 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2010-09-30 16:09:37 +0200 |
| commit | f37658a9eccd1e0e8a9ad48212d037344b0bfaee (patch) | |
| tree | 3039133c42cca7e019db86e0dd7d700cc09b5eba | |
| parent | 1c8015f0f5c242b4c44680c71eae7a801af9939f (diff) | |
| download | ayatana-indicator-datetime-f37658a9eccd1e0e8a9ad48212d037344b0bfaee.tar.gz ayatana-indicator-datetime-f37658a9eccd1e0e8a9ad48212d037344b0bfaee.tar.bz2 ayatana-indicator-datetime-f37658a9eccd1e0e8a9ad48212d037344b0bfaee.zip | |
* Cherry-picked from upstream:
- Fix date string format (12/24h) not taken from translation (LP: #579134)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index c5467dd..9584cd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.6-0ubuntu3) UNRELEASED; urgency=low + + * Cherry-picked from upstream: + - Fix date string format (12/24h) not taken from translation (LP: #579134) + + -- Didier Roche <didrocks@ubuntu.com> Thu, 30 Sep 2010 16:08:19 +0200 + indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low * Rebuild for libindicator ABI change (LP: #637692) diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index cef2b00..acdc340 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -220,14 +220,14 @@ indicator_datetime_init (IndicatorDatetime *self) self->priv->idle_measure = 0; self->priv->max_width = 0; - self->priv->time_string = g_strdup(DEFAULT_TIME_FORMAT); - self->priv->time_mode = SETTINGS_TIME_LOCALE; self->priv->show_seconds = FALSE; self->priv->show_date = FALSE; self->priv->show_day = FALSE; self->priv->custom_string = g_strdup(DEFAULT_TIME_FORMAT); + self->priv->time_string = generate_format_string(self); + self->priv->service_proxy = NULL; self->priv->sm = NULL; |