summaryrefslogtreecommitdiff
path: root/doc/reference
diff options
context:
space:
mode:
authorTiffany Chang (tic) <tic@odoo.com>2020-03-03 14:21:31 +0000
committerTiffany Chang (tic) <tic@odoo.com>2020-03-31 10:31:35 +0000
commit1ac243c21ca0c392723902ac73249f3f3fa0849f (patch)
treef08c29dbd93eafdf88ee24622b076b84f1985665 /doc/reference
parent52dc25d428e254092797a1e001e2ad9a17e01129 (diff)
[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.
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/javascript_reference.rst4
-rw-r--r--doc/reference/mixins.rst2
-rw-r--r--doc/reference/qweb.rst2
-rw-r--r--doc/reference/views.rst8
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst
index 8b3df82c85e..b5028149498 100644
--- a/doc/reference/javascript_reference.rst
+++ b/doc/reference/javascript_reference.rst
@@ -2062,7 +2062,7 @@ Relational fields
- can_create: allow the creation of related records (take precedence over no_create
option)
- - can_write: allow the edition of related records (default: true)
+ - can_write: allow the editing of related records (default: true)
Options:
@@ -2103,7 +2103,7 @@ Relational fields
- kanban.many2one (KanbanFieldMany2One)
Default widget for many2one fields (in kanban view). We need to disable all
- edition in kanban views.
+ editing in kanban views.
- Supported field types: *many2one*
diff --git a/doc/reference/mixins.rst b/doc/reference/mixins.rst
index 7e72f533c77..c80ffc52c79 100644
--- a/doc/reference/mixins.rst
+++ b/doc/reference/mixins.rst
@@ -904,7 +904,7 @@ usually the way to go:
<field name="website_published" widget="website_button"/>
</button>
-In the frontend, some security checks are needed to avoid showing 'Edition'
+In the frontend, some security checks are needed to avoid showing 'Editing'
buttons to website visitors:
.. code-block:: xml
diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst
index 4bec9c900cf..cedb458b3d2 100644
--- a/doc/reference/qweb.rst
+++ b/doc/reference/qweb.rst
@@ -346,7 +346,7 @@ Asset bundles
The ``t-field`` directive can only be used when performing field access
(``a.b``) on a "smart" record (result of the ``browse`` method). It is able
to automatically format based on field type, and is integrated in the
-website's rich text edition.
+website's rich text editing.
``t-options`` can be used to customize fields, the most common option
is ``widget``, other options are field- or widget-dependent.
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 6f05359cb6d..65951b75f5b 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -87,7 +87,7 @@ an impact on all view types.
* ``edit`` (``form`` & ``list`` & ``gantt``)
- Disable/enable record edition on the view.
+ Disable/enable record editing on the view.
* ``delete`` (``form`` & ``list``)
@@ -777,7 +777,7 @@ system. Available semantic components are:
dialog, ``cancel`` to close the dialog without saving.
``field``
- renders (and allow edition of, possibly) a single field of the current
+ renders (and allow editing of, possibly) a single field of the current
record. Using several times a field in a form view is supported and the fields
can receive different values for modifiers 'invisible' and 'readonly'. However,
the behavior is not guaranteed when several fields exist with different values
@@ -828,7 +828,7 @@ system. Available semantic components are:
``context``
for relational fields only, context to pass when fetching possible values
``readonly``
- display the field in both readonly and edition mode, but never make it
+ display the field in both readonly and edit mode, but never make it
editable
``required``
generates an error and prevents saving the record if the field doesn't
@@ -1331,7 +1331,7 @@ root can have the following attributes:
.. note:: if the ``edit`` attribute is set to ``false``, the ``editable`` option will be ignored.
``multi_edit``
- editable or not editable list can activate the multi-edition feature by defining
+ editable or not editable list can activate the multi-editing feature by defining
the `multi_edit=1`
``default_order``