Merge lp:~mterry/indicator-datetime/lc-time-fixes into lp:indicator-datetime/0.3

[Michael Terry]

This branch does several locale/time-related things:

 * Uses N_ on DEFAULT_TIME_12_FORMAT and DEFAULT_TIME_24_FORMAT so they will appear in the pot file
 * Adds a is_locale_12h function so that we don't have to rely on translators to determine if the locale is 12 or 24 hours
 * Adds a T_ function to translate a string according to the locale specified by LC_TIME, not the one specified by LC_MESSAGES. This means that when the user sets their preferred time locale in gnome-language-selector (for example), indicator-datetime will respect that when looking up time-related translations.
 * Added a po/Makevars to pass --keyword=T_ to xgettext
 * Fixes a minor typo in the gsettings schema

[Ted Gould (ted)]

Wow, very cool. Only comment is that g_setenv's third parameter should really be TRUE/FALSE instead of an int. I'll fix that on merge.

review: Approve

=== modified file 'data/org.ayatana.indicator.datetime.gschema.xml'
--- data/org.ayatana.indicator.datetime.gschema.xml	2010-07-15 20:02:17 +0000
+++ data/org.ayatana.indicator.datetime.gschema.xml	2010-12-15 17:02:56 +0000
@@ -13,7 +13,7 @@
 			  Controls the time format that is displayed in the indicator.  For almost
 			  all users this should be the default for their locale.  If you think the
 			  setting is wrong for your locale please join or talk to the translation
-			  team for your langauge.  If you just want something different you can
+			  team for your language.  If you just want something different you can
 			  adjust this to be either 12 or 24 time.  Or, you can use a custom format
 			  string and set the custom-time-format setting.
 			</description>

=== added file 'po/Makevars'
--- po/Makevars	1970-01-01 00:00:00 +0000
+++ po/Makevars	2010-12-15 17:02:56 +0000
@@ -0,0 +1,7 @@
+DOMAIN = $(PACKAGE)
+subdir = po
+top_builddir = ..
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=T_ --from-code=UTF-8
+COPYRIGHT_HOLDER = Canonical Ltd.
+MSGID_BUGS_ADDRESS = [e-mail]
+EXTRA_LOCALE_CATEGORIES =

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2010-09-30 13:52:20 +0000
+++ src/indicator-datetime.c	2010-12-15 17:02:56 +0000
@@ -23,6 +23,10 @@
 #include "config.h"
 #endif
 
+#include <locale.h>
+#include <langinfo.h>
+#include <string.h>
+
 /* GStuff */
 #include <glib.h>
 #include <glib-object.h>
@@ -119,8 +123,14 @@
 	SETTINGS_TIME_CUSTOM = 3
 };
 
-#define DEFAULT_TIME_12_FORMAT   "%l:%M %p"
-#define DEFAULT_TIME_24_FORMAT   "%H:%M"
+/* TRANSLATORS: A format string for the strftime function for
+   a clock showing 12-hour time without seconds. */
+#define DEFAULT_TIME_12_FORMAT   N_("%l:%M %p")
+
+/* TRANSLATORS: A format string for the strftime function for
+   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 INDICATOR_DATETIME_GET_PRIVATE(o) \
@@ -840,6 +850,53 @@
 	return;
 }
 
+/* Translate msg according to the locale specified by LC_TIME */
+static char *
+T_(const char *msg)
+{
+	/* General strategy here is to make sure LANGUAGE is empty (since that
+	   trumps all LC_* vars) and then to temporarily swap LC_TIME and
+	   LC_MESSAGES.  Then have gettext translate msg.
+
+	   We strdup the strings because the setlocale & *env functions do not
+	   guarantee anything about the storage used for the string, and thus
+	   the string may not be portably safe after multiple calls.
+
+	   Note that while you might think g_dcgettext would do the trick here,
+	   that actually looks in /usr/share/locale/XX/LC_TIME, not the
+	   LC_MESSAGES directory, so we won't find any translation there.
+	*/
+	char *message_locale = g_strdup(setlocale(LC_MESSAGES, NULL));
+	char *time_locale = g_strdup(setlocale(LC_TIME, NULL));
+	char *language = g_strdup(g_getenv("LANGUAGE"));
+	char *rv;
+	g_unsetenv("LANGUAGE");
+	setlocale(LC_MESSAGES, time_locale);
+
+	/* Get the LC_TIME version */
+	rv = _(msg);
+
+	/* Put everything back the way it was */
+	setlocale(LC_MESSAGES, message_locale);
+	g_setenv("LANGUAGE", language, 1);
+	g_free(message_locale);
+	g_free(time_locale);
+	g_free(language);
+	return rv;
+}
+
+static gboolean
+is_locale_12h()
+{
+	static const char *formats_24h[] = {"%H", "%R", "%T", "%OH", "%k", NULL};
+        const char *t_fmt = nl_langinfo(T_FMT);
+        int i;
+        for (i = 0; formats_24h[i]; ++i)
+                if (strstr(t_fmt, formats_24h[i]))
+                        return FALSE;
+        return TRUE;
+}
+
 /* Tries to figure out what our format string should be.  Lots
    of translator comments in here. */
 static gchar *
@@ -852,17 +909,7 @@
 	gboolean twelvehour = TRUE;
 
 	if (self->priv->time_mode == SETTINGS_TIME_LOCALE) {
-		/* TRANSLATORS: This string is used to determine the default
-		   clock style for your locale.  If it is the string '12' then
-		   the default will be a 12-hour clock using AM/PM string.  If
-		   it is '24' then it will be a 24-hour clock.  Users may over
-		   ride this setting so it's still important to translate the
-		   other strings no matter how this is set. */
-		const gchar * locale_default = _("12");
-
-		if (g_strcmp0(locale_default, "24") == 0) {
-			twelvehour = FALSE;
-		}
+		twelvehour = is_locale_12h();
 	} else if (self->priv->time_mode == SETTINGS_TIME_24_HOUR) {
 		twelvehour = FALSE;
 	}
@@ -872,21 +919,17 @@
 		if (self->priv->show_seconds) {
 			/* TRANSLATORS: A format string for the strftime function for
 			   a clock showing 12-hour time with seconds. */
-			time_string = _("%l:%M:%S %p");
+			time_string = T_("%l:%M:%S %p");
 		} else {
-			/* TRANSLATORS: A format string for the strftime function for
-			   a clock showing 12-hour time. */
-			time_string = _(DEFAULT_TIME_12_FORMAT);
+			time_string = T_(DEFAULT_TIME_12_FORMAT);
 		}
 	} else {
 		if (self->priv->show_seconds) {
 			/* TRANSLATORS: A format string for the strftime function for
 			   a clock showing 24-hour time with seconds. */
-			time_string = _("%H:%M:%S");
+			time_string = T_("%H:%M:%S");
 		} else {
-			/* TRANSLATORS: A format string for the strftime function for
-			   a clock showing 24-hour time. */
-			time_string = _(DEFAULT_TIME_24_FORMAT);
+			time_string = T_(DEFAULT_TIME_24_FORMAT);
 		}
 	}
 	
@@ -903,15 +946,15 @@
 	if (self->priv->show_date && self->priv->show_day) {
 		/* TRANSLATORS:  This is a format string passed to strftime to represent
 		   the day of the week, the month and the day of the month. */
-		date_string = _("%a %b %e");
+		date_string = T_("%a %b %e");
 	} else if (self->priv->show_date) {
 		/* TRANSLATORS:  This is a format string passed to strftime to represent
 		   the month and the day of the month. */
-		date_string = _("%b %e");
+		date_string = T_("%b %e");
 	} else if (self->priv->show_day) {
 		/* TRANSLATORS:  This is a format string passed to strftime to represent
 		   the day of the week. */
-		date_string = _("%a");
+		date_string = T_("%a");
 	}
 
 	/* Check point, we should have a date string */
@@ -920,7 +963,7 @@
 	/* 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(_("%s, %s"), date_string, time_string);
+	return g_strdup_printf(T_("%s, %s"), date_string, time_string);
 }
 
 static gboolean