[jfroche@blade2]/usr/lib/schooltool-vauban/src/schooltool/app -> svn diff 16:25
Index: browser/cal.py
===================================================================
--- browser/cal.py (revision 6518)
+++ browser/cal.py (working copy)
@@ -89,6 +89,7 @@
from schooltool.person.interfaces import IPerson, IPersonPreferences
from schooltool.person.interfaces import vocabulary
from schooltool.resource.interfaces import IResource
+from schooltool.skin.dateformatter import DateFormatterFullView
from schooltool.timetable.interfaces import ICompositeTimetables
from schooltool.term.term import getTermForDate
@@ -375,10 +376,6 @@
self.date = date
self.events = events
day_of_week = day_of_week_names[date.weekday()]
- self.title = _('${day_of_week}, ${date}',
- mapping = {'day_of_week': day_of_week,
- 'date': date.strftime('%Y-%m-%d')})
-
def __cmp__(self, other):
return cmp(self.date, other.date)
@@ -427,9 +424,12 @@
return url + '.pdf'
def dayTitle(self, day):
- dayformat = '%A, ' + self.dateformat
- return u'' + day.strftime(dayformat)
+ formatter = DateFormatterFullView(day, self.request)
+ return formatter()
+
+
+
__url = None
def calURL(self, cal_type, cursor=None):
@@ -859,9 +859,11 @@
def title(self):
month_name_msgid = month_names[self.cursor.month]
month_name = translate(month_name_msgid, context=self.request)
- msg = _('${month}, ${year} (week ${week})',
+ week_title = translate(_("week"), context=self.request)
+ msg = _('${month}, ${year} (${week_title} ${week})',
mapping = {'month': month_name,
'year': self.cursor.year,
+ 'week_title': week_title,
'week': self.cursor.isocalendar()[1]})
return msg
Index: browser/templates/cal_weekly.pt
===================================================================
--- browser/templates/cal_weekly.pt (revision 6517)
+++ browser/templates/cal_weekly.pt (working copy)
@@ -11,7 +11,7 @@
tal:attributes="class python:' '.join(filter(None, ['day-title',
start and 'first' or '',
day.today()]))">
- <a tal:content="day/title" i18n:translate=""
+ <a tal:content="day/date/@@fullDate" i18n:translate=""
tal:attributes="href python:view.calURL('daily', day.date)" />
</th>
</tal:loop>
@@ -27,7 +27,7 @@
class python:start and 'first' or '';
style string:background: ${event/color1};;
border-color: ${event/color2};
- title event/title;
+ title event/date/@@fullDate;
href event/editLink">
<span tal:content="event/shortTitle"/>
<tal:if condition="not:event/allday">
+ formatter = DateFormatterFullView(day, self.request)
+ return formatter()
+
+
+
You should lookup a view in here instead of hardcoding it and adding a dependency to schooltool.skin
__url = None
def calURL(self, cal_type, cursor=None):
@@ -859,9 +859,11 @@
def title(self):
month_name_msgid = month_names[self.cursor.month]
month_name = translate(month_name_msgid, context=self.request)
- msg = _('${month}, ${year} (week ${week})',
+ week_title = translate(_("week"), context=self.request)
+ msg = _('${month}, ${year} (${week_title} ${week})',
mapping = {'month': month_name,
'year': self.cursor.year,
+ 'week_title': week_title,
'week': self.cursor.isocalendar()[1]})
Nope, wrong, the _('${month}, ${year} (week ${week})' is a translatable string which means that it will get translated.