reverted: --- evolution-2.30.3/e-util/e-datetime-format.c +++ evolution-2.30.3.orig/e-util/e-datetime-format.c @@ -208,35 +208,8 @@ } else { if (future) res = g_strdup_printf (_("%d days from now"), diff); + else - else if (diff > 7) res = g_strdup_printf (_("%d days ago"), diff); - else { - switch(g_date_get_weekday(&val)) { - case G_DATE_MONDAY: - res = g_strdup_printf (_("Mon"), diff); - break; - case G_DATE_TUESDAY: - res = g_strdup_printf (_("Tue"), diff); - break; - case G_DATE_WEDNESDAY: - res = g_strdup_printf (_("Wed"), diff); - break; - case G_DATE_THURSDAY: - res = g_strdup_printf (_("Thu"), diff); - break; - case G_DATE_FRIDAY: - res = g_strdup_printf (_("Fri"), diff); - break; - case G_DATE_SATURDAY: - res = g_strdup_printf (_("Sat"), diff); - break; - case G_DATE_SUNDAY: - res = g_strdup_printf (_("Sun"), diff); - break; - default: - res = g_strdup_printf (_("Unknown"), diff); - } - } } } diff -u evolution-2.30.3/debian/changelog evolution-2.30.3/debian/changelog --- evolution-2.30.3/debian/changelog +++ evolution-2.30.3/debian/changelog @@ -1,9 +1,10 @@ -evolution (2.30.3-1ubuntu5.ppa1) maverick; urgency=low +evolution (2.30.3-1ubuntu5.ppa2) maverick; urgency=low * Non-maintainer upload. - * Patch e-datetime-format to show weekday names when using abbreviated date + * debian/patches/92_dateformat_ad_uses_weekdays.patch: + - Changed abbreviated date to show weekdays for dates in the last 7 days - -- Oded Thu, 30 Sep 2010 15:58:45 +0200 + -- Oded Thu, 30 Sep 2010 16:31:29 +0200 evolution (2.30.3-1ubuntu5) maverick; urgency=low