diff --git a/addons/calendar/data/calendar_data.xml b/addons/calendar/data/calendar_data.xml index 5c0e79da9eb..7f9b93d083f 100644 --- a/addons/calendar/data/calendar_data.xml +++ b/addons/calendar/data/calendar_data.xml @@ -40,13 +40,13 @@ notification - 2~3 Hour(s) mail + 3 Hour(s), by e-mail hours email - 5~6 Hour(s) mail + 6 Hour(s), by e-mail hours email diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot index 59bb6681530..05c4b992817 100644 --- a/addons/calendar/i18n/calendar.pot +++ b/addons/calendar/i18n/calendar.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-10 11:35+0000\n" -"PO-Revision-Date: 2017-10-10 11:35+0000\n" +"POT-Creation-Date: 2017-11-08 09:11+0000\n" +"PO-Revision-Date: 2017-11-08 09:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -317,6 +317,41 @@ msgstr "" msgid "%s has declined invitation" msgstr "" +#. module: calendar +#: model:calendar.alarm,name:calendar.alarm_notif_5 +msgid "1 Day(s)" +msgstr "" + +#. module: calendar +#: model:calendar.alarm,name:calendar.alarm_notif_3 +msgid "1 Hour(s)" +msgstr "" + +#. module: calendar +#: model:calendar.alarm,name:calendar.alarm_notif_1 +msgid "15 Minute(s)" +msgstr "" + +#. module: calendar +#: model:calendar.alarm,name:calendar.alarm_notif_4 +msgid "2 Hour(s)" +msgstr "" + +#. module: calendar +#: model:calendar.alarm,name:calendar.alarm_mail_1 +msgid "3 Hour(s), by email" +msgstr "" + +#. module: calendar +#: model:calendar.alarm,name:calendar.alarm_notif_2 +msgid "30 Minute(s)" +msgstr "" + +#. module: calendar +#: model:calendar.alarm,name:calendar.alarm_mail_2 +msgid "6 Hour(s), by email" +msgstr "" + #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form_popup diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py index fc296be5abc..57a6822fffa 100644 --- a/addons/calendar/models/calendar.py +++ b/addons/calendar/models/calendar.py @@ -484,7 +484,7 @@ class Alarm(models.Model): _interval_selection = {'minutes': 'Minute(s)', 'hours': 'Hour(s)', 'days': 'Day(s)'} - name = fields.Char('Name', required=True) + name = fields.Char('Name', translate=True, required=True) type = fields.Selection([('notification', 'Notification'), ('email', 'Email')], 'Type', required=True, default='email') duration = fields.Integer('Remind Before', required=True, default=1) interval = fields.Selection(list(_interval_selection.items()), 'Unit', required=True, default='hours')