summaryrefslogtreecommitdiff
path: root/doc/reference
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-06-15 11:30:27 +0200
committerChristophe Simonis <chs@odoo.com>2018-06-15 11:30:27 +0200
commit50860317ccd2c1b44f873598858a3cff87fa7ea6 (patch)
tree2b752e71a34a062112c2e28acf4a2993336ec3e6 /doc/reference
parent42ba1298d8d908c6d34b64f25be4e5c71e7888a3 (diff)
parentb170a753e18c96f59e8c99a4e1750a4b85628338 (diff)
[MERGE] forward port branch saas-11.2 up to b170a753e18
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/cmdline.rst39
-rw-r--r--doc/reference/javascript_reference.rst18
2 files changed, 57 insertions, 0 deletions
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst
index 4171f12c5e1..12cd5f7a9d8 100644
--- a/doc/reference/cmdline.rst
+++ b/doc/reference/cmdline.rst
@@ -221,6 +221,45 @@ database
'verify-ca' or 'verify-full'
Default value is 'prefer'
+.. _reference/cmdline/server/internationalisation:
+
+Internationalisation
+--------------------
+
+Use these options to translate Odoo to another language. See i18n section of
+the user manual. Option '-d' is mandatory. Option '-l' is mandatory in case
+of importation
+
+.. option:: --load-language <languages>
+
+ specifies the languages (separated by commas) for the translations you
+ want to be loaded
+
+.. option:: -l, --language <language>
+
+ specify the language of the translation file. Use it with --i18n-export
+ or --i18n-import
+
+.. option:: --i18n-export <filename>
+
+ export all sentences to be translated to a CSV file, a PO file or a TGZ
+ archive and exit.
+
+.. option:: --i18n-import <filename>
+
+ import a CSV or a PO file with translations and exit. The '-l' option is
+ required.
+
+.. option:: --i18n-overwrite
+
+ overwrites existing translation terms on updating a module or importing
+ a CSV or a PO file.
+
+.. option:: --modules
+
+ specify modules to export. Use in combination with --i18n-export
+
+
built-in HTTP
-------------
diff --git a/doc/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst
index d13b2b86412..e6bfeba0726 100644
--- a/doc/reference/javascript_reference.rst
+++ b/doc/reference/javascript_reference.rst
@@ -1329,11 +1329,27 @@ order.
- Supported field types: *date*, *datetime*
+ Options:
+
+ - datepicker: extra settings for the datepicker_ widget.
+
+ .. code-block:: xml
+
+ <field name="datefield" options='{"datepicker": {"daysOfWeekDisabled": [0, 6]}}'/>
+
- datetime (FieldDateTime)
This is the default field type for fields of type *datetime*.
- Supported field types: *date*, *datetime*
+ Options:
+
+ - datepicker: extra settings for the datepicker_ widget.
+
+ .. code-block:: xml
+
+ <field name="datefield" options='{"datepicker": {"daysOfWeekDisabled": [0, 6]}}'/>
+
- monetary (FieldMonetary)
This is the default field type for fields of type 'monetary'. It is used to
display a currency. If there is a currency fields given in option, it will
@@ -1822,4 +1838,6 @@ Relational fields
.. _event delegation:
http://api.jquery.com/delegate/
+.. _datepicker: https://github.com/Eonasdan/bootstrap-datetimepicker
+
.. _deferred: http://api.jquery.com/category/deferred-object/