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

[FIX] calendar: translatable date content 

The time_display is present in a translatable email template but was not
translated. Added the missing term.

Updated .pot file for a few missing terms.
Removed base_calendar.pot that has no reason to be in 8.0

Fixes #9573
This commit is contained in:
Martin Trigaux 2015-11-25 14:35:02 +01:00
parent 2fd14db574
commit 1c5c255186
3 changed files with 40 additions and 1590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/calendar/calendar.py
View File

@ -797,9 +797,9 @@ class calendar_event(osv.Model):
time = _("AllDay , %s") % (event_date)
elif zduration < 24:
duration = date + timedelta(hours=zduration)
time = ("%s at (%s To %s) (%s)") % (event_date, display_time, duration.strftime(format_time), tz)
time = _("%s at (%s To %s) (%s)") % (event_date, display_time, duration.strftime(format_time), tz)
else:
time = ("%s at %s To\n %s at %s (%s)") % (event_date, display_time, date_deadline.strftime(format_date), date_deadline.strftime(format_time), tz)
time = _("%s at %s To\n %s at %s (%s)") % (event_date, display_time, date_deadline.strftime(format_date), date_deadline.strftime(format_time), tz)
return time
def _compute(self, cr, uid, ids, fields, arg, context=None):

1575
addons/calendar/i18n/base_calendar.pot
View File

File diff suppressed because it is too large Load Diff

51
addons/calendar/i18n/calendar.pot
View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-21 14:07+0000\n"
"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"POT-Creation-Date: 2015-11-25 13:28+0000\n"
"PO-Revision-Date: 2015-11-25 13:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -43,11 +43,11 @@ msgid "\n"
" <table>\n"
" <tr>\n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
" ${object.event_id.get_interval(object.event_id.start,'day')}\n"
" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
" </div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td>\n"
@ -161,11 +161,11 @@ msgid "\n"
" <table>\n"
" <tr>\n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
" ${object.event_id.get_interval(object.event_id.start,'day')}\n"
" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
" </div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td>\n"
@ -286,11 +286,11 @@ msgid " \n"
" <table>\n"
" <tr> \n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
" ${object.event_id.get_interval(object.event_id.start,'day')}\n"
" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
" </div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td>\n"
@ -404,6 +404,19 @@ msgstr ""
msgid "${object.event_id.name} - Reminder"
msgstr ""
#. module: calendar
#: code:addons/calendar/calendar.py:802
#, python-format
msgid "%s at %s To\n"
" %s at %s (%s)"
msgstr ""
#. module: calendar
#: code:addons/calendar/calendar.py:800
#, python-format
msgid "%s at (%s To %s) (%s)"
msgstr ""
#. module: calendar
#: model:ir.actions.act_window,help:calendar.action_calendar_event
msgid "<p class=\"oe_view_nocontent_create\">\n"
@ -530,6 +543,13 @@ msgstr ""
msgid "Calendar"
msgstr ""
#. module: calendar
#: view:calendar.alarm:calendar.view_calendar_alarm_tree
#: model:ir.actions.act_window,name:calendar.action_calendar_alarm
#: model:ir.ui.menu,name:calendar.menu_calendar_alarm
msgid "Calendar Alarm"
msgstr ""
#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/xml/base_calendar.xml:42
@ -653,6 +673,11 @@ msgstr ""
msgid "Duration"
msgstr ""
#. module: calendar
#: field:calendar.alarm,duration_minutes:0
msgid "Duration in minutes"
msgstr ""
#. module: calendar
#: selection:calendar.alarm,type:0
#: field:calendar.attendee,email:0
@ -660,7 +685,7 @@ msgid "Email"
msgstr ""
#. module: calendar
#: code:addons/calendar/calendar.py:1381
#: code:addons/calendar/calendar.py:1402
#, python-format
msgid "Email addresses not found"
msgstr ""
@ -823,7 +848,7 @@ msgstr ""
#. module: calendar
#: help:calendar.event,active:0
msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
msgid "If the active field is set to false, it will allow you to hide the event alarm information without removing it."
msgstr ""
#. module: calendar