Lernid

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

  1. lernid-lucian
  2. Merge into trunk
Proposed by Lucian Adrian Grijincu
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~lucian.grijincu/lernid/lernid-lucian
Merge into: lp://staging/lernid
Diff against target: 34 lines (+3/-3)
2 files modified
bin/lernid (+2/-2)
data/ui/AboutLernidDialog.ui (+1/-1)
To merge this branch: bzr merge lp://staging/~lucian.grijincu/lernid/lernid-lucian
Reviewer Review Type Date Requested Status
Jono Bacon Approve
Review via email: mp+15926@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Lucian Adrian Grijincu (lucian.grijincu) wrote :

Fix https://bugs.edge.launchpad.net/lernid/+bug/491933

Revision history for this message
Jono Bacon (jonobacon) wrote :

Awesome work, thanks!

review: Approve
lp://staging/~lucian.grijincu/lernid/lernid-lucian updated
47. By Jono Bacon

Merging in p:~lucian.grijincu/lernid/lernid-lucian

 - Fixes LP #491933
 - Fixed LP #493319

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/lernid'
--- bin/lernid 2009-12-06 20:25:49 +0000
+++ bin/lernid 2009-12-10 11:00:29 +0000
@@ -168,7 +168,7 @@
168 tempevent = {}168 tempevent = {}
169 169
170 # reverse the list to get the events in chronological order170 # reverse the list to get the events in chronological order
171 self.schedule.reverse()171 self.schedule.sort(lambda x,y: cmp(x['start_local'], y['start_local']))
172172
173 def populate_schedule_view(self):173 def populate_schedule_view(self):
174 """Populate the schedule Treeview with events"""174 """Populate the schedule Treeview with events"""
@@ -403,7 +403,7 @@
403 #support for command line options403 #support for command line options
404 import logging, optparse404 import logging, optparse
405 gettext.install('lernid', unicode=True)405 gettext.install('lernid', unicode=True)
406 parser = optparse.OptionParser(version="%prog %ver")406 parser = optparse.OptionParser(version="%prog 0.3")
407 parser.add_option("-v", "--verbose", action="store_true", dest="verbose", help=_("Show debug messages"))407 parser.add_option("-v", "--verbose", action="store_true", dest="verbose", help=_("Show debug messages"))
408 (options, args) = parser.parse_args()408 (options, args) = parser.parse_args()
409409
410410
=== modified file 'data/ui/AboutLernidDialog.ui'
--- data/ui/AboutLernidDialog.ui 2009-12-10 02:56:04 +0000
+++ data/ui/AboutLernidDialog.ui 2009-12-10 11:00:29 +0000
@@ -9,7 +9,7 @@
9 <property name="type_hint">normal</property>9 <property name="type_hint">normal</property>
10 <property name="has_separator">False</property>10 <property name="has_separator">False</property>
11 <property name="program_name">Lernid</property>11 <property name="program_name">Lernid</property>
12 <property name="version">0.2</property>12 <property name="version">0.3</property>
13 <property name="comments" translatable="yes">Connect to a world of online tutorials quickly and easily.</property>13 <property name="comments" translatable="yes">Connect to a world of online tutorials quickly and easily.</property>
14 <property name="website">http://www.launchpad.net/lernid/</property>14 <property name="website">http://www.launchpad.net/lernid/</property>
15 <property name="license" translatable="yes">Copyright (C) 2009 &lt;Jono Bacon&gt; &lt;jono@ubuntu.com&gt;15 <property name="license" translatable="yes">Copyright (C) 2009 &lt;Jono Bacon&gt; &lt;jono@ubuntu.com&gt;

Subscribers

People subscribed via source and target branches