Merge lp:~daker/loco-team-portal/fix.tz-feeds into lp:loco-team-portal

Proposed by Adnane Belmadiaf on 2012-12-16
Status: Merged
Approved by: Adnane Belmadiaf on 2012-12-17
Approved revision: 582
Merged at revision: 582
Proposed branch: lp:~daker/loco-team-portal/fix.tz-feeds
Merge into: lp:loco-team-portal
Diff against target: 37 lines (+3/-2)
3 files modified
loco_directory/common/context_processors.py (+2/-1)
loco_directory/events/models.py (+1/-0)
loco_directory/events/views.py (+0/-1)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.tz-feeds
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers 2012-12-16 Pending
Review via email: mp+140112@code.launchpad.net

Commit message

Fixed the context_processors
Fixed TZ in RSS feed

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/common/context_processors.py'
2--- loco_directory/common/context_processors.py 2012-12-15 03:12:04 +0000
3+++ loco_directory/common/context_processors.py 2012-12-16 23:33:20 +0000
4@@ -7,7 +7,8 @@
5
6 import version
7
8-def ltp_version(request):
9+
10+def loco_version(request):
11 """
12 add the loco version to template context processor.
13 """
14
15=== modified file 'loco_directory/events/models.py'
16--- loco_directory/events/models.py 2012-12-04 22:17:11 +0000
17+++ loco_directory/events/models.py 2012-12-16 23:33:20 +0000
18@@ -105,6 +105,7 @@
19 """
20 return a event as ical
21 """
22+ cal.add('x-wr-timezone').value = self.tz
23 event = cal.add('vevent')
24 event.add('uid').value = str(self.id)
25 event.add('dtstart').value = pytz.utc.localize(self.date_begin)
26
27=== modified file 'loco_directory/events/views.py'
28--- loco_directory/events/views.py 2012-12-09 23:26:25 +0000
29+++ loco_directory/events/views.py 2012-12-16 23:33:20 +0000
30@@ -46,7 +46,6 @@
31 calendar.add('prodid').value = '-//loco.ubuntu.com//EN'
32 calendar.add('calscale').value = 'GREGORIAN'
33 calendar.add('method').value = 'PUBLISH'
34- calendar.add('x-wr-timezone').value = 'UTC'
35 calendar.add('x-wr-calname').value = name
36 calendar.add('x-wr-caldesc').value = name
37 for event in events:

Subscribers

People subscribed via source and target branches