From 71c92e8ecb646ae408eccf540bcb924aa0e05cad Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Mon, 18 May 2020 08:18:14 +0000 Subject: [PATCH] [IMP] hr_holidays: Fix time off plural labels Purpose ======= The noun time off is uncountable. The plural form of time off is also time off. closes odoo/odoo#51370 Signed-off-by: Yannick Tivisse (yti) --- addons/hr_holidays/models/hr_leave.py | 2 +- addons/hr_holidays/models/hr_leave_type.py | 2 +- addons/hr_holidays/static/src/js/time_off_calendar.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 4af264c8d0f..5e88edf967e 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -542,7 +542,7 @@ class HolidaysRequest(models.Model): ] nholidays = self.search_count(domain) if nholidays: - raise ValidationError(_('You can not set 2 times off that overlaps on the same day for the same employee.')) + raise ValidationError(_('You can not set 2 time off that overlaps on the same day for the same employee.')) @api.constrains('state', 'number_of_days', 'holiday_status_id') def _check_holidays(self): diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py index ec57acd1022..f0c015d4ea0 100644 --- a/addons/hr_holidays/models/hr_leave_type.py +++ b/addons/hr_holidays/models/hr_leave_type.py @@ -73,7 +73,7 @@ class HolidaysType(models.Model): company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env.company) responsible_id = fields.Many2one('res.users', 'Responsible', domain=lambda self: [('groups_id', 'in', self.env.ref('hr_holidays.group_hr_holidays_user').id)], - help="This user will be responsible for approving this type of times off. " + help="This user will be responsible for approving this type of time off. " "This is only used when validation is 'hr' or 'both'",) leave_validation_type = fields.Selection([ ('no_validation', 'No Validation'), diff --git a/addons/hr_holidays/static/src/js/time_off_calendar.js b/addons/hr_holidays/static/src/js/time_off_calendar.js index dd5c94f01dd..fab4366e1d9 100644 --- a/addons/hr_holidays/static/src/js/time_off_calendar.js +++ b/addons/hr_holidays/static/src/js/time_off_calendar.js @@ -42,7 +42,7 @@ odoo.define('hr_holidays.dashboard.view_custo', function(require) { /** * Render the buttons and add new button about - * times off and allocations request + * time off and allocations request * * @override */