odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] calendar: loading problem with some locales 

When you try to load calendar_demo.xml, the loading of demo event
`calendar_event_1` fails with fr_BE locale (and probably some others).

This is due to the rendering of the mail template
`calendar_template_meeting_invitation` (which is used when you create
an event).

This template used a method `get_interval()` in calendar.py, which
does not always return Unicode strings. Furthermore, these strings
are dates and should be formatted according to user locale.

PS: Yeah, we love Python2's management of encodings and Unicode...
This commit is contained in:
Richard Mathot 2015-02-10 13:37:14 +01:00
parent 51e9f90981
commit af94e5af6b
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
addons/calendar/calendar.py
View File

@ -7,6 +7,7 @@ import openerp
import openerp.service.report import openerp.service.report
import uuid import uuid
import collections import collections
import babel.dates
from werkzeug.exceptions import BadRequest from werkzeug.exceptions import BadRequest
from datetime import datetime, timedelta from datetime import datetime, timedelta
from dateutil import parser from dateutil import parser
@ -1440,7 +1441,16 @@ class calendar_event(osv.Model):
return invitation return invitation
def get_interval(self, cr, uid, ids, date, interval, tz=None, context=None): def get_interval(self, cr, uid, ids, date, interval, tz=None, context=None):
#Function used only in calendar_event_data.xml for email template ''' Format and localize some dates to be used in email templates
:param string date: date/time to be formatted
:param string interval: Among 'day', 'month', 'dayname' and 'time' indicating the desired formatting
:param string tz: Timezone indicator (optional)
:return unicode: Formatted date or time (as unicode string, to prevent jinja2 crash)
(Function used only in calendar_event_data.xml) '''
date = openerp.fields.Datetime.from_string(date) date = openerp.fields.Datetime.from_string(date)
if tz: if tz:
@ -1448,14 +1458,23 @@ class calendar_event(osv.Model):
date = date.replace(tzinfo=pytz.timezone('UTC')).astimezone(timezone) date = date.replace(tzinfo=pytz.timezone('UTC')).astimezone(timezone)
if interval == 'day': if interval == 'day':
res = str(date.day) # Day number (1-31)
res = unicode(date.day)
elif interval == 'month': elif interval == 'month':
res = date.strftime('%B') + " " + str(date.year) # Localized month name and year
res = babel.dates.format_date(date=date, format='MMMM y', locale=context.get('lang', 'en_US'))
elif interval == 'dayname': elif interval == 'dayname':
res = date.strftime('%A') # Localized day name
res = babel.dates.format_date(date=date, format='EEEE', locale=context.get('lang', 'en_US'))
elif interval == 'time': elif interval == 'time':
# Localized time
dummy, format_time = self.get_date_formats(cr, uid, context=context) dummy, format_time = self.get_date_formats(cr, uid, context=context)
res = date.strftime(format_time + " %Z") res = tools.ustr(date.strftime(format_time + " %Z"))
return res return res
def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False): def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):