diff options
| author | Olivier Dony <odo@openerp.com> | 2016-01-13 17:13:05 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2016-01-13 17:13:05 +0100 |
| commit | 39bd21fc479a85532e1f6368d3fc9d04c8fb2c68 (patch) | |
| tree | a7dcb9a067e9ba07de11bd5db8c0801019ef96fc /addons/web | |
| parent | 9ad5c66a44d9a0bf67089e3f5e530d8d9fb57491 (diff) | |
| parent | 3be9d911c0d50cbe6e4e5768d40011849cc43972 (diff) | |
[MERGE] Forward-port 9.0 up to rev. 3be9d911c0d50cbe6e4e5768d40011849cc43972
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/i18n/web.pot | 257 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
3 files changed, 206 insertions, 56 deletions
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot index b2bb27eface..0414d335633 100644 --- a/addons/web/i18n/web.pot +++ b/addons/web/i18n/web.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-12 14:29+0000\n" -"PO-Revision-Date: 2015-10-12 14:29+0000\n" +"POT-Creation-Date: 2016-01-13 14:43+0000\n" +"PO-Revision-Date: 2016-01-13 14:43+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -181,6 +181,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:106 +#, python-format +msgid "(Community Edition)" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/xml/base_common.xml:100 #, python-format msgid "(no string)" @@ -219,6 +226,14 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/js/widgets/user_menu.js:81 +#: code:addons/web/static/src/xml/base.xml:84 +#, python-format +msgid "About" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/framework/crash_manager.js:25 #, python-format msgid "Access Denied" @@ -233,6 +248,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:1503 +#, python-format +msgid "Access to all Enterprise Apps" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/widgets/sidebar.js:24 #, python-format msgid "Action" @@ -254,72 +276,79 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:666 +#: code:addons/web/static/src/js/views/form_widgets.js:660 #, python-format msgid "Activate" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:663 +#: code:addons/web/static/src/xml/base.xml:96 +#, python-format +msgid "Activate the developer mode" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/views/form_widgets.js:657 #, python-format msgid "Active" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1357 -#: code:addons/web/static/src/xml/base.xml:1059 -#: code:addons/web/static/src/xml/base.xml:1299 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1367 +#: code:addons/web/static/src/xml/base.xml:1110 +#: code:addons/web/static/src/xml/base.xml:1343 #, python-format msgid "Add" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1172 +#: code:addons/web/static/src/xml/base.xml:1216 #, python-format msgid "Add Custom Filter" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1173 +#: code:addons/web/static/src/xml/base.xml:1217 #, python-format msgid "Add a condition" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1006 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1016 #, python-format msgid "Add an item" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1183 +#: code:addons/web/static/src/xml/base.xml:1227 #, python-format msgid "Add custom group" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:272 +#: code:addons/web/static/src/xml/base.xml:323 #, python-format msgid "Add..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1298 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1308 #, python-format msgid "Add: " msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1079 +#: code:addons/web/static/src/xml/base.xml:1123 #, python-format msgid "Advanced Search..." msgstr "" @@ -333,22 +362,29 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:513 +#: code:addons/web/static/src/xml/base.xml:564 #, python-format msgid "All users" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1173 -#: code:addons/web/static/src/xml/base.xml:1193 +#: code:addons/web/static/src/xml/base.xml:1508 +#, python-format +msgid "And more" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:1217 +#: code:addons/web/static/src/xml/base.xml:1237 #, python-format msgid "Apply" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:670 +#: code:addons/web/static/src/js/views/form_widgets.js:664 #: code:addons/web/static/src/js/views/list_view.js:308 #, python-format msgid "Archive" @@ -370,34 +406,41 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:244 +#: code:addons/web/static/src/xml/base.xml:295 #, python-format msgid "Attachment :" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1283 +#: code:addons/web/static/src/xml/base.xml:1327 #, python-format msgid "Available fields" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:565 +#: code:addons/web/static/src/xml/base.xml:616 #, python-format msgid "Bar Chart" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1946 +#: code:addons/web/static/src/js/views/list_view.js:1955 #, python-format msgid "Binary file" msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:1507 +#, python-format +msgid "Bugfixes guarantee" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/xml/base_common.xml:97 #, python-format msgid "Button" @@ -516,22 +559,23 @@ msgstr "" msgid "Context:" msgstr "" -#: code:addons/web/static/src/xml/base.xml:80 -#: code:addons/web/static/src/xml/base_common.xml:159 +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:116 #, python-format msgid "Copyright © 2004-2015 Odoo S.A." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1351 +#: code:addons/web/static/src/js/views/form_widgets.js:1347 #, python-format msgid "Could not display the selected image." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1101 +#: code:addons/web/static/src/js/views/list_view.js:1110 #, python-format msgid "Could not find id in dataset" msgstr "" @@ -626,21 +670,28 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:624 +#: code:addons/web/static/src/xml/base.xml:110 +#, python-format +msgid "Database expiration:" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:675 #, python-format msgid "Day" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:664 +#: code:addons/web/static/src/js/views/form_widgets.js:658 #, python-format msgid "Deactivate" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:470 +#: code:addons/web/static/src/xml/base.xml:521 #, python-format msgid "Default:" msgstr "" @@ -700,6 +751,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:82 +#, python-format +msgid "Documentation" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/xml/base_common.xml:63 #, python-format msgid "Domain:" @@ -949,20 +1007,27 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1169 +#: code:addons/web/static/src/xml/base.xml:1213 #, python-format msgid "Filters" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:598 +#: code:addons/web/static/src/xml/base.xml:649 #, python-format msgid "Flip axis" msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:119 +#, python-format +msgid "For more information visit" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/views/form_view.js:34 #: code:addons/web/static/src/js/views/form_view.js:357 #, python-format @@ -971,6 +1036,20 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:118 +#, python-format +msgid "GNU Lesser General Public License" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:1500 +#, python-format +msgid "Get this feature and much more with Odoo Enterprise!" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/framework/crash_manager.js:24 #, python-format msgid "Global Business Error" @@ -1051,41 +1130,48 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/widgets/debug_manager.js:106 -#: code:addons/web/static/src/xml/base.xml:165 +#: code:addons/web/static/src/xml/base.xml:211 #, python-format msgid "JS Tests" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:845 +#: code:addons/web/controllers/main.py:769 #, python-format msgid "Languages" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:208 +#: code:addons/web/static/src/xml/base.xml:254 #, python-format msgid "Latest Modification Date:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:204 +#: code:addons/web/static/src/xml/base.xml:250 #, python-format msgid "Latest Modification by:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:177 +#: code:addons/web/static/src/xml/base.xml:223 #, python-format msgid "Leave Debug Mode" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:566 +#: code:addons/web/static/src/xml/base.xml:118 +#, python-format +msgid "Licenced under the terms of" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:617 #, python-format msgid "Line Chart" msgstr "" @@ -1213,6 +1299,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:1505 +#, python-format +msgid "Mobile support" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/widgets/debug_manager.js:129 #, python-format msgid "Model %s fields" @@ -1316,6 +1409,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:1504 +#, python-format +msgid "New design" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/views/search_inputs.js:330 #, python-format msgid "No" @@ -1430,6 +1530,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:101 +#, python-format +msgid "Odoo (Formerly OpenERP)" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/apps.js:189 #, python-format msgid "Odoo Apps will be available soon" @@ -1437,19 +1544,40 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1678 +#: code:addons/web/static/src/js/views/form_widgets.js:1675 #, python-format msgid "Odoo Enterprise" msgstr "" #. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:117 +#, python-format +msgid "Odoo S.A." +msgstr "" + +#. module: web #: model:ir.ui.view,arch_db:web.qunit_suite msgid "Odoo Web Tests" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:677 +#: code:addons/web/static/src/xml/base.xml:117 +#, python-format +msgid "Odoo is a trademark of" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:119 +#, python-format +msgid "Odoo.com" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/views/form_widgets.js:671 #, python-format msgid "Off" msgstr "" @@ -1487,24 +1615,31 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/progress_bar.js:76 +#: code:addons/web/static/src/js/widgets/progress_bar.js:79 #, python-format msgid "Only Integer Value should be valid." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:506 +#: code:addons/web/static/src/xml/base.xml:557 #, python-format msgid "Only you" msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:198 +#, python-format +msgid "Open Debug Menu" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/views/form_relational_widgets.js:153 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:924 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1088 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1314 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:928 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1098 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1324 #, python-format msgid "Open: " msgstr "" @@ -1856,14 +1991,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:676 +#: code:addons/web/static/src/xml/base.xml:83 +#, python-format +msgid "Support" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/views/form_widgets.js:670 #, python-format msgid "Switch Off" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:678 +#: code:addons/web/static/src/js/views/form_widgets.js:672 #, python-format msgid "Switch On" msgstr "" @@ -2105,36 +2247,36 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/data.js:1113 +#: code:addons/web/static/src/js/framework/data.js:1120 #, python-format msgid "Unsupported operator %s in domain %s" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1661 +#: code:addons/web/static/src/js/views/form_widgets.js:1658 #, python-format msgid "Upgrade now" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1658 +#: code:addons/web/static/src/xml/base.xml:1506 #, python-format -msgid "Upgrade to <a href=\"https://www.odoo.com/editions\">Odoo Enterprise</a> to activate this feature." +msgid "Upgrade to future versions" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:919 -#: code:addons/web/static/src/xml/base.xml:980 +#: code:addons/web/static/src/xml/base.xml:970 +#: code:addons/web/static/src/xml/base.xml:1031 #, python-format msgid "Uploading ..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1620 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1633 #: code:addons/web/static/src/js/widgets/sidebar.js:168 #, python-format msgid "Uploading Error" @@ -2163,6 +2305,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/xml/base.xml:105 +#, python-format +msgid "Version" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/widgets/priority.js:51 #, python-format msgid "Very High" diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 96107503a5f..4d39d8df806 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -81,7 +81,6 @@ var WidgetButton = common.FormWidget.extend({ }, on_confirmed: function() { var self = this; - var context = this.build_context(); return this.view.do_execute_action( _.extend({}, this.node.attrs, {context: context}), @@ -89,6 +88,8 @@ var WidgetButton = common.FormWidget.extend({ if (!_.isObject(reason)) { self.view.recursive_reload(); } + }).fail(function () { + self.view.recursive_reload(); }); }, check_disable: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ce4b04a5a87..713a1cf18de 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -195,7 +195,7 @@ <t t-name="WebClient.DebugManager"> <li class="oe_debug_manager"> - <a href="#" t-att-title='_t("Open Debug Menu")' class="dropdown-toggle oe_debug_button" data-toggle="dropdown"> + <a href="#" title="Open Debug Menu" class="dropdown-toggle oe_debug_button" data-toggle="dropdown"> <span class="fa fa-bug"/> <b class="caret"/> </a> |
