diff --git a/addons/delivery/__manifest__.py b/addons/delivery/__manifest__.py index 82d78edee1e..4ab66c11916 100644 --- a/addons/delivery/__manifest__.py +++ b/addons/delivery/__manifest__.py @@ -28,6 +28,7 @@ invoices from picking, the system is able to add and compute the shipping line. 'views/report_package_barcode.xml', 'views/res_config_settings_views.xml', 'wizard/choose_delivery_package_views.xml', + 'views/assets.xml', ], 'demo': ['data/delivery_demo.xml'], 'installable': True, diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index 179e938ca77..3327508d74e 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-19 13:43+0000\n" -"PO-Revision-Date: 2018-02-19 13:43+0000\n" +"POT-Creation-Date: 2019-07-17 15:01+0000\n" +"PO-Revision-Date: 2019-07-17 15:01+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -241,6 +241,13 @@ msgstr "" msgid "Debug logging" msgstr "" +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:13 +#, python-format +msgid "Debug requests" +msgstr "" + #. module: delivery #: model:ir.ui.menu,name:delivery.menu_delivery msgid "Delivery" @@ -324,6 +331,13 @@ msgstr "" msgid "Determine the display order" msgstr "" +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:14 +#, python-format +msgid "Disable debug" +msgstr "" + #. module: delivery #: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form msgid "Discard" @@ -343,6 +357,13 @@ msgid "Each carrier (e.g. UPS) can have several delivery methods (e.g.\n" " to each method." msgstr "" +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:16 +#, python-format +msgid "Enable debug" +msgstr "" + #. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_prod_environment msgid "Environment" @@ -559,6 +580,13 @@ msgstr "" msgid "No carrier set for this order." msgstr "" +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:15 +#, python-format +msgid "No debug" +msgstr "" + #. module: delivery #: code:addons/delivery/models/delivery_grid.py:100 #, python-format @@ -657,6 +685,13 @@ msgstr "" msgid "Product Template" msgstr "" +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:9 +#, python-format +msgid "Production Environment" +msgstr "" + #. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_type #: model:ir.model.fields,field_description:delivery.field_stock_picking_delivery_type @@ -766,6 +801,27 @@ msgstr "" msgid "Stock Move" msgstr "" +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:12 +#, python-format +msgid "Switch to production environment" +msgstr "" + +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:10 +#, python-format +msgid "Switch to test environment" +msgstr "" + +#. module: delivery +#. openerp-web +#: code:addons/delivery/static/src/js/delivery_translations.js:11 +#, python-format +msgid "Test Environment" +msgstr "" + #. module: delivery #: model:delivery.carrier,name:delivery.delivery_carrier #: model:product.product,name:delivery.product_product_delivery_poste diff --git a/addons/delivery/static/src/js/delivery_translations.js b/addons/delivery/static/src/js/delivery_translations.js new file mode 100644 index 00000000000..565adbcb69f --- /dev/null +++ b/addons/delivery/static/src/js/delivery_translations.js @@ -0,0 +1,16 @@ +// TODO Remove me >=saas-12.5, this is a disgrace +// This is an hack to get the string_* and hover_* options translated on the +// boolean_button terminology widget. The terms are translated through +// _t(opt_terms.string_true) which will only work if the terms are already +// present in the translation map. +// This code does nothing but marks the strings as translatable +var _t = function(x) { return x; }; + +_t("Production Environment"); +_t("Switch to test environment"); +_t("Test Environment"); +_t("Switch to production environment"); +_t("Debug requests"); +_t("Disable debug"); +_t("No debug"); +_t("Enable debug"); diff --git a/addons/delivery/views/assets.xml b/addons/delivery/views/assets.xml new file mode 100644 index 00000000000..851aaca55c9 --- /dev/null +++ b/addons/delivery/views/assets.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot index b86c3a77a01..00823aac3f0 100644 --- a/addons/payment/i18n/payment.pot +++ b/addons/payment/i18n/payment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-03 15:07+0000\n" -"PO-Revision-Date: 2019-01-03 15:07+0000\n" +"POT-Creation-Date: 2019-07-17 15:01+0000\n" +"PO-Revision-Date: 2019-07-17 15:01+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1002,6 +1002,20 @@ msgstr "" msgid "Provider" msgstr "" +#. module: payment +#. openerp-web +#: code:addons/payment/static/src/js/payment_translations.js:9 +#, python-format +msgid "Publish" +msgstr "" + +#. module: payment +#. openerp-web +#: code:addons/payment/static/src/js/payment_translations.js:8 +#, python-format +msgid "Published" +msgstr "" + #. module: payment #: selection:payment.acquirer,payment_flow:0 msgid "Redirection to the acquirer website" diff --git a/addons/payment/static/src/js/payment_translations.js b/addons/payment/static/src/js/payment_translations.js new file mode 100644 index 00000000000..199dcc2a276 --- /dev/null +++ b/addons/payment/static/src/js/payment_translations.js @@ -0,0 +1,10 @@ +// TODO Remove me >=saas-12.5, this is a disgrace +// This is an hack to get the string_true and hover_false options translated on +// the boolean_button terminology widget. The terms are translated through +// _t(opt_terms.string_true) which will only work if the terms are already +// present in the translation map. +// This code does nothing but marks the strings as translatable +var _t = function(x) { return x; }; + +_t("Published"); +_t("Publish"); diff --git a/addons/payment/views/assets.xml b/addons/payment/views/assets.xml index c5639ba06d2..6c8aaddb394 100644 --- a/addons/payment/views/assets.xml +++ b/addons/payment/views/assets.xml @@ -10,4 +10,11 @@ + + +