From 1ac243c21ca0c392723902ac73249f3f3fa0849f Mon Sep 17 00:00:00 2001 From: "Tiffany Chang (tic)" Date: Tue, 3 Mar 2020 14:21:31 +0000 Subject: [PATCH] [IMP] various: Replace incorrect use of "edition" "Edition" is a French-English false friend word. "Edition" in English means "version" whereas "edition" in French means "editing". This commit updates user facing strings/documents that incorrectly use "edition" instead of "edit" or "editing". Attempts were made to clean up English around "edition" usage so please excuse any errors from lack of context knowledge. Code comments and names incorrectly using "edition" were NOT updated. --- addons/barcodes/static/src/js/barcode_form_view.js | 2 +- addons/hr/models/res_config_settings.py | 2 +- addons/hr/tests/test_self_user_access.py | 2 +- addons/mail/models/mail_activity.py | 2 +- addons/note/README.md | 2 +- addons/portal/__manifest__.py | 2 +- addons/purchase/views/res_config_settings_views.xml | 2 +- addons/stock/models/stock_inventory.py | 2 +- addons/stock/models/stock_quant.py | 2 +- addons/web_editor/static/src/js/editor/editor.js | 2 +- addons/website/doc/website.snippet.rst | 2 +- addons/website/static/src/js/editor/editor_menu.js | 2 +- addons/website_event/README.md | 2 +- addons/website_sale/README.md | 2 +- doc/howtos/web.rst | 4 ++-- doc/howtos/website.rst | 10 +++++----- doc/reference/javascript_reference.rst | 4 ++-- doc/reference/mixins.rst | 2 +- doc/reference/qweb.rst | 2 +- doc/reference/views.rst | 8 ++++---- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js index 82ca913d752..5e24923f20c 100644 --- a/addons/barcodes/static/src/js/barcode_form_view.js +++ b/addons/barcodes/static/src/js/barcode_form_view.js @@ -61,7 +61,7 @@ FormController.include({ _barcodeAddX2MQuantity: function (barcode, activeBarcode) { if (this.mode === 'readonly') { this.do_warn(_t('Error: Document not editable'), - _t('To modify this document, please first start edition.')); + _t('To modify this document, please enable edit mode.')); return Promise.reject(); } diff --git a/addons/hr/models/res_config_settings.py b/addons/hr/models/res_config_settings.py index e6d209afb58..72a4516794b 100644 --- a/addons/hr/models/res_config_settings.py +++ b/addons/hr/models/res_config_settings.py @@ -18,4 +18,4 @@ class ResConfigSettings(models.TransientModel): module_hr_attendance = fields.Boolean(string="Based on attendances") hr_presence_control_email_amount = fields.Integer(related="company_id.hr_presence_control_email_amount", readonly=False) hr_presence_control_ip_list = fields.Char(related="company_id.hr_presence_control_ip_list", readonly=False) - hr_employee_self_edit = fields.Boolean(string="Employee Edition", config_parameter='hr.hr_employee_self_edit') + hr_employee_self_edit = fields.Boolean(string="Employee Editing", config_parameter='hr.hr_employee_self_edit') diff --git a/addons/hr/tests/test_self_user_access.py b/addons/hr/tests/test_self_user_access.py index bd165a31932..248232b9f04 100644 --- a/addons/hr/tests/test_self_user_access.py +++ b/addons/hr/tests/test_self_user_access.py @@ -45,7 +45,7 @@ class TestSelfAccessProfile(TestHrCommon): form = Form(james, view=view) for field in employee_related_fields: - with self.assertRaises(AssertionError, msg="Field '%s' should be readonly in the employee profile when self edition is not allowed." % field): + with self.assertRaises(AssertionError, msg="Field '%s' should be readonly in the employee profile when self editing is not allowed." % field): form.__setattr__(field, 'some value') diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index 1f735e1b1f2..9ce3b5bcd7b 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -79,7 +79,7 @@ class MailActivityType(models.Model): #Fields for display purpose only initial_res_model_id = fields.Many2one('ir.model', 'Initial model', compute="_compute_initial_res_model_id", store=False, - help='Technical field to keep trace of the model at the beginning of the edition for UX related behaviour') + help='Technical field to keep track of the model at the start of editing to support UX related behaviour') res_model_change = fields.Boolean(string="Model has change", help="Technical field for UX related behaviour", default=False, store=False) @api.onchange('res_model_id') diff --git a/addons/note/README.md b/addons/note/README.md index 9eeea063546..39f87bbdb25 100644 --- a/addons/note/README.md +++ b/addons/note/README.md @@ -52,7 +52,7 @@ Write down your ideas in pads, keep your notes at your finger tips, attach relat Collaborative Meeting Minutes ----------------------------- -### Real-time sharing and edition of notes +### Real-time sharing and editing of notes The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread. diff --git a/addons/portal/__manifest__.py b/addons/portal/__manifest__.py index d396abdc6cd..c185b3f68cb 100644 --- a/addons/portal/__manifest__.py +++ b/addons/portal/__manifest__.py @@ -14,7 +14,7 @@ portal. This module contains most code coming from odoo v10 website_portal. Purpose of this module is to allow the display of a customer portal without having -a dependency towards website edition and customization capabilities.""", +a dependency towards website editing and customization capabilities.""", 'depends': ['web', 'web_editor', 'http_routing', 'mail', 'auth_signup'], 'data': [ 'security/ir.model.access.csv', diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml index 352c9cd1eb2..52c0a1dabf4 100644 --- a/addons/purchase/views/res_config_settings_views.xml +++ b/addons/purchase/views/res_config_settings_views.xml @@ -41,7 +41,7 @@