Merge lp:~gunnarhj/ubuntu/raring/evolution-data-server/days-months into lp:ubuntu/raring/evolution-data-server

[Gunnar Hjalmarsson]

debian/patches/01_days_months_in_current_language.patch:
Display names of weekdays and months in the current language
(LP: #1160441).

[Jamie Strandboge (jdstrand)]

The patch states "Forwarded: no". Does this not affect upstream?

review: Needs Information

[Iain Lane (laney)]

Any news on that question?

Unmerged revisions

186. By Gunnar Hjalmarsson on 2013-04-21

debian/patches/01_days_months_in_current_language.patch:
Display names of weekdays and months in the current language
(LP: #1160441).

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-21 11:01:22 +0000
+++ debian/changelog	2013-04-21 12:10:34 +0000
@@ -1,3 +1,11 @@
+evolution-data-server (3.6.4-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/01_days_months_in_current_language.patch:
+    Display names of weekdays and months in the current language
+    (LP: #1160441).
+
+ -- Gunnar Hjalmarsson <[e-mail]>  Sun, 21 Apr 2013 13:09:00 +0200
+
 evolution-data-server (3.6.4-0ubuntu1) raring; urgency=low
 
   * New upstream release.

=== added directory 'debian/patches'
=== added file 'debian/patches/01_days_months_in_current_language.patch'
--- debian/patches/01_days_months_in_current_language.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_days_months_in_current_language.patch	2013-04-21 12:10:34 +0000
@@ -0,0 +1,109 @@
+Description: Display names of weekdays and months in the current language
+Bug: https://launchpad.net/bugs/1160441
+Forwarded: no
+Author: Gunnar Hjalmarsson <[e-mail]>
+
+--- evolution-data-server-3.6.4.orig/libedataserver/e-data-server-util.c	2012-11-13 10:12:28 +0000
++++ evolution-data-server-3.6.4/libedataserver/e-data-server-util.c	2013-04-21 03:42:42 +0200
+@@ -21,6 +21,7 @@
+ 
+ #include "config.h"
+ 
++#include <locale.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <time.h>
+@@ -584,6 +585,75 @@
+ }
+ 
+ /**
++ * Helper for e_strftime()
++ *
++ * Translate names of days and months using the current language by
++ * splitting a format specification and applying a suitable locale
++ * when converting respective token.
++ **/
++static gsize
++strftime_days_months (gchar           *string,
++                      gsize            max,
++                      const gchar     *fmt,
++                      const struct tm *tm)
++{
++	gchar *tmp = NULL;
++	gint i, j;
++	gchar formatted_token[100];
++
++	gchar **tokens = g_strsplit (fmt, " ", 0);
++
++	/* Conversion specifications for names of days and months */
++	const gchar *dm_names[] = { "%a", "%A", "%b", "%B", "%h", NULL };
++
++	/* Get some locale info */
++	const gchar *time_locale = setlocale (LC_TIME, NULL);
++	const gchar *message_locale = setlocale (LC_MESSAGES, NULL);
++
++	for (i = 0; tokens[i] != NULL; i++)
++	{
++		gboolean is_day_month = FALSE;
++
++		for (j = 0; dm_names[j] != NULL; j++) {
++			if (g_strrstr (tokens[i], dm_names[j]) != NULL) {
++				is_day_month = TRUE;
++				break;
++			}
++		}
++
++		if (is_day_month)
++			setlocale (LC_TIME, message_locale);
++		else
++			setlocale (LC_TIME, time_locale);
++
++		if (strlen (tokens[i]) == 0)
++			formatted_token[0] = '\0';
++		else {
++			if (!strftime (formatted_token, max, tokens[i], tm)) {
++				g_free (tmp);
++				break;
++			}
++		}
++
++		if (i == 0)
++			tmp = g_strdup (formatted_token);
++		else
++			tmp = g_strjoin (" ", tmp, formatted_token, NULL);
++	}
++
++	/* Reset the locale */
++	setlocale (LC_TIME, time_locale);
++
++	g_strfreev (tokens);
++	if (!tmp)
++		return 0;
++
++	strcpy (string, tmp);
++	g_free (tmp);
++	return strlen (string);
++}
++
++/**
+  * e_strftime:
+  * @string: The string array to store the result in.
+  * @max: The size of array @s.
+@@ -612,7 +682,7 @@
+ 	g_return_val_if_fail (tm != NULL, 0);
+ 
+ #ifdef HAVE_LKSTRFTIME
+-	ret = strftime (string, max, fmt, tm);
++	ret = strftime_days_months (string, max, fmt, tm);
+ #else
+ 	ffmt = g_strdup (fmt);
+ 	ff = ffmt;
+@@ -636,7 +706,7 @@
+ 	}
+ #endif
+ 
+-	ret = strftime (string, max, ffmt, tm);
++	ret = strftime_days_months (string, max, ffmt, tm);
+ 	g_free (ffmt);
+ #endif
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-04-21 12:10:34 +0000
@@ -0,0 +1,1 @@
+01_days_months_in_current_language.patch