Merge lp:~lucian.grijincu/lernid/lernid-lucian into lp:lernid

[Lucian Adrian Grijincu]

[Lucian Adrian Grijincu (lucian.grijincu)]

internationalized date time
+ updated application description (you might want to change the description)

=== modified file 'bin/lernid'
--- bin/lernid	2009-12-10 16:43:59 +0000
+++ bin/lernid	2009-12-12 18:08:12 +0000
@@ -161,9 +161,13 @@
             utc_end_ft = datetime.datetime.strptime(vobject.icalendar.dateTimeToString(ev.dtend.value)[0:15], "%Y%m%dT%H%M%S")
             local_start_datetime = time.localtime((int(time.mktime(time.strptime(str(utc_start_ft), '%Y-%m-%d %H:%M:%S'))) - time.timezone))
             local_end_datetime = time.localtime((int(time.mktime(time.strptime(str(utc_end_ft), '%Y-%m-%d %H:%M:%S'))) - time.timezone))
-    
-            tempevent['start_local'] = time.strftime("%Y-%m-%d %H:%M:%S", local_start_datetime)
-            tempevent['end_local'] = time.strftime("%Y-%m-%d %H:%M:%S", local_end_datetime)
+            # Translators: this is in strftime format. See http://docs.python.org/library/time.html#time.strftime
+            # This is the format of the displayed date.
+            # The month name is localized: it defaults to something like "15 June 2010" for 'en' or "15 Juin 2009" for 'fr', etc.
+            tempevent['start_local_date'] = time.strftime(_("%d %B %Y"), local_start_datetime)
+            tempevent['start_local_time'] = time.strftime("%X", local_start_datetime)
+            tempevent['start_local'] = local_start_datetime
+            tempevent['end_local_time'] = time.strftime("%X", local_end_datetime)
             tempevent['title'] = ev.summary.value
             tempevent['start_utc'] = str(datetime.datetime.strptime(vobject.icalendar.dateTimeToString(ev.dtstart.value)[0:15], "%Y%m%dT%H%M%S"))
             tempevent['end_utc'] = str(datetime.datetime.strptime(vobject.icalendar.dateTimeToString(ev.dtend.value)[0:15], "%Y%m%dT%H%M%S"))
@@ -212,9 +216,10 @@
                 
         for l in self.schedule:
             # set up tree view
+            #XXX
             templist.append(gtk.STOCK_DND)
-            templist.append(l['start_local'][0:10])
-            templist.append(l['start_local'][11:16] + " - " + l['end_local'][12:16])
+            templist.append(l['start_local_date'])
+            templist.append(l['start_local_time'] + " - " + l['end_local_time'])
             templist.append(l['title'])
             self.schedule_model.append(templist)            
             
@@ -409,6 +414,7 @@
     return window
 
 if __name__ == "__main__":
+    locale.setlocale(locale.LC_ALL, '')
     #support for command line options
     import logging, optparse
     gettext.install('lernid', unicode=True)

=== modified file 'lernid.desktop.in'
--- lernid.desktop.in	2009-11-26 17:44:15 +0000
+++ lernid.desktop.in	2009-12-12 18:08:12 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Lernid
-_Comment=Lernid application
+_Comment=Participate in online Ubuntu learning events
 Categories=GNOME;Network;
 Exec=lernid
 Icon=/usr/share/lernid/media/icon.png

=== modified file 'po/lernid.pot'
--- po/lernid.pot	2009-12-10 17:00:30 +0000
+++ po/lernid.pot	2009-12-12 18:08:12 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-10 08:57-0800\n"
+"POT-Creation-Date: 2009-12-12 20:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -73,7 +73,7 @@
 msgstr ""
 
 #: ../lernid.desktop.in.h:2
-msgid "Lernid application"
+msgid "Participate in online Ubuntu learning events"
 msgstr ""
 
 #: ../data/ui/ConnectDialog.ui.h:1
@@ -88,14 +88,21 @@
 msgid "Nickname"
 msgstr ""
 
-#: ../bin/lernid.py:295 ../bin/lernid.py:296
+#. Translators: this is in strftime format. See http://docs.python.org/library/time.html#time.strftime
+#. This is the format of the displayed date.
+#. The month name is localized: it defaults to something like "15 June 2010" for 'en' or "15 Juin 2009" for 'fr', etc.
+#: ../bin/lernid.py:167
+msgid "%d %B %Y"
+msgstr ""
+
+#: ../bin/lernid.py:300 ../bin/lernid.py:301
 msgid "Connected to "
 msgstr ""
 
-#: ../bin/lernid.py:325
+#: ../bin/lernid.py:330
 msgid "Disconnecting from "
 msgstr ""
 
-#: ../bin/lernid.py:416
+#: ../bin/lernid.py:422
 msgid "Show debug messages"
 msgstr ""