Merge lp:~russell-linderer/calendar-indicator/fixbug965240 into lp:calendar-indicator/precise

[Russell Linderer]

Fixes bug 965240 by changing the date format from fixed dd-mm-YYYY to showing time based on locale of user.

Unmerged revisions

25. By Russell Linderer on 2012-09-24

Fixed bug forcing dates to DD-MM-YYYY instead of following set locale (LP:#965240)

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-22 22:07:14 +0000
+++ debian/changelog	2012-09-24 21:40:28 +0000
@@ -1,3 +1,9 @@
+calendar-indicator (0.0.3.3-1ubuntu2) precise; urgency=low
+
+  * Fixed bug forcing dates to DD-MM-YYYY instead of following set locale (LP:#965240) 
+
+ -- Russell Linderer <[e-mail]>  Mon, 24 Sep 2012 16:30:04 -0500
+
 calendar-indicator (0.0.3.3-1ubuntu1) precise; urgency=low
 
   * Fixed a bug with preferences Dialog

=== modified file 'src/calendar-indicator.py'
--- src/calendar-indicator.py	2012-07-22 20:53:26 +0000
+++ src/calendar-indicator.py	2012-09-24 21:40:28 +0000
@@ -98,7 +98,7 @@
 		time = cadena.split('T')[1].split(':')
 		time = datetime.time(int(time[0]),int(time[1]),int(time[2][0:2]))
 	date = datetime.date(int(date[0]),int(date[1]),int(date[2]))
-	return date.strftime('%d/%m/%Y')+' - '+time.strftime('%H:%M')
+	return date.strftime('%x')+' - '+time.strftime('%H:%M')
 	
 def get_date(event,start=True):
 	if start: