From b776d66d85ccfafb0bdcd3323a371090becde097 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 1 Oct 2015 10:54:04 +0200 Subject: [PATCH] [FIX] all: ressource -> resource Courtesy of Kris Krnacs --- addons/base_setup/res_config_view.xml | 2 +- addons/gamification/models/challenge.py | 2 +- addons/hr_gamification/__openerp__.py | 2 +- addons/mail/controllers/bus.py | 2 +- addons/mail/models/mail_thread.py | 2 +- addons/product/res_config_view.xml | 2 +- addons/rating/models/rating.py | 4 ++-- addons/survey/data/survey_demo_feedback.xml | 2 +- addons/web/controllers/main.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 267cb2b339b..7b64ae24ad9 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -87,7 +87,7 @@ - + diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py index cc719818106..2634e34be22 100644 --- a/addons/gamification/models/challenge.py +++ b/addons/gamification/models/challenge.py @@ -90,7 +90,7 @@ class gamification_challenge(osv.Model): def _get_categories(self, cr, uid, context=None): return [ - ('hr', 'Human Ressources / Engagement'), + ('hr', 'Human Resources / Engagement'), ('other', 'Settings / Gamification Tools'), ] diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py index 9acfaafb2d1..a1d6a8ca5e3 100644 --- a/addons/hr_gamification/__openerp__.py +++ b/addons/hr_gamification/__openerp__.py @@ -6,7 +6,7 @@ 'category': 'hidden', 'website': 'https://www.odoo.com/page/employees', 'depends': ['gamification', 'hr'], - 'description': """Use the HR ressources for the gamification process. + 'description': """Use the HR resources for the gamification process. The HR officer can now manage challenges and badges. This allow the user to send badges to employees instead of simple users. diff --git a/addons/mail/controllers/bus.py b/addons/mail/controllers/bus.py index 3de670a8bbe..7461140453e 100644 --- a/addons/mail/controllers/bus.py +++ b/addons/mail/controllers/bus.py @@ -11,7 +11,7 @@ class MailChatController(openerp.addons.bus.controllers.main.BusController): def _default_request_uid(self): """ For Anonymous people, they receive the access right of SUPERUSER_ID since they have NO access (auth=none) !!! Each time a method from this controller is call, there is a check if the user (who can be anonymous and Sudo access) - can access to the ressource. + can access to the resource. """ return request.session.uid and request.session.uid or SUPERUSER_ID diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index aec3907f09e..1d2f73bac66 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -57,7 +57,7 @@ class MailThread(models.AbstractModel): Options: - _mail_flat_thread: if set to True, all messages without parent_id are automatically attached to the first message posted on the - ressource. If set to False, the display of Chatter is done using + resource. If set to False, the display of Chatter is done using threads, and no parent_id is automatically set. ''' _name = 'mail.thread' diff --git a/addons/product/res_config_view.xml b/addons/product/res_config_view.xml index c1f9d98dd66..465f4ea8145 100644 --- a/addons/product/res_config_view.xml +++ b/addons/product/res_config_view.xml @@ -6,7 +6,7 @@ base.config.settings - + diff --git a/addons/rating/models/rating.py b/addons/rating/models/rating.py index 7a21a2ea77d..62b8996f81a 100644 --- a/addons/rating/models/rating.py +++ b/addons/rating/models/rating.py @@ -22,10 +22,10 @@ class Rating(models.Model): def new_access_token(self): return uuid.uuid4().hex - res_name = fields.Char(string='Resource Name', compute='_compute_res_name', store=True, help="The name of the rated ressource.") + res_name = fields.Char(string='Resource Name', compute='_compute_res_name', store=True, help="The name of the rated resource.") res_model = fields.Char(string='Document Model', required=True, help="Model name of the rated object", index=True) res_id = fields.Integer(string='Document ID', required=True, help="Identifier of the rated object", index=True) - rated_partner_id = fields.Many2one('res.partner', string="Rated Partner", help="Owner of the rated ressource") + rated_partner_id = fields.Many2one('res.partner', string="Rated Partner", help="Owner of the rated resource") partner_id = fields.Many2one('res.partner', string='Customer', help="Author of the rating") rating = fields.Float(string="Rating", group_operator="avg", default=-1, help="Rating value") feedback = fields.Text('Feedback reason', help="Reason of the rating") diff --git a/addons/survey/data/survey_demo_feedback.xml b/addons/survey/data/survey_demo_feedback.xml index 9d74485ede0..d802591cbbd 100644 --- a/addons/survey/data/survey_demo_feedback.xml +++ b/addons/survey/data/survey_demo_feedback.xml @@ -81,7 +81,7 @@ 6 - Human Ressources + Human Resources diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 7d5d68f9788..1dc97dc07c1 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -241,7 +241,7 @@ def manifest_glob(extension, addons=None, db=None, include_remotes=False): return r def manifest_list(extension, mods=None, db=None, debug=None): - """ list ressources to load specifying either: + """ list resources to load specifying either: mods: a comma separated string listing modules db: a database name (return all installed modules in that database) """