diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-25 17:17:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-25 17:17:15 +0200 |
| commit | cfb0c0deadae316d9bbcae4d6d177a75f3dbbce4 (patch) | |
| tree | 961774158c47e97694ec1093f947262beaa0eef1 /addons/web_editor | |
| parent | 77d231546d252c3f83d54c18d75864a15bc09b24 (diff) | |
| parent | 7ae5121877aec43a19a447b9b9d6a37f4a5633c2 (diff) | |
[MERGE] forward port branch saas-11 up to 7ae5121
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/i18n/bg.po | 10 | ||||
| -rw-r--r-- | addons/web_editor/i18n/fa.po | 8 | ||||
| -rw-r--r-- | addons/web_editor/i18n/he.po | 4 | ||||
| -rw-r--r-- | addons/web_editor/i18n/ja.po | 6 | ||||
| -rw-r--r-- | addons/web_editor/i18n/pl.po | 4 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/widgets.js | 8 |
6 files changed, 20 insertions, 20 deletions
diff --git a/addons/web_editor/i18n/bg.po b/addons/web_editor/i18n/bg.po index b1449edf3ee..4d5629ddccf 100644 --- a/addons/web_editor/i18n/bg.po +++ b/addons/web_editor/i18n/bg.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:26+0000\n" -"PO-Revision-Date: 2015-09-30 09:29+0000\n" +"PO-Revision-Date: 2016-07-17 03:24+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Bulgarian (http://www.transifex.com/odoo/odoo-9/language/bg/)\n" "MIME-Version: 1.0\n" @@ -261,7 +261,7 @@ msgstr "" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_display_name msgid "Display Name" -msgstr "" +msgstr "Име за показване" #. module: web_editor #. openerp-web @@ -549,7 +549,7 @@ msgstr "" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub___last_update msgid "Last Modified on" -msgstr "" +msgstr "Последно променено на" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_write_uid @@ -1150,7 +1150,7 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:179 #, python-format msgid "all" -msgstr "" +msgstr "всички" #. module: web_editor #. openerp-web @@ -1204,7 +1204,7 @@ msgstr "" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_float msgid "ir.qweb.field.float" -msgstr "" +msgstr "ir.qweb.field.float" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_html diff --git a/addons/web_editor/i18n/fa.po b/addons/web_editor/i18n/fa.po index ac2b60d56e4..6e0c7c184e6 100644 --- a/addons/web_editor/i18n/fa.po +++ b/addons/web_editor/i18n/fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:26+0000\n" -"PO-Revision-Date: 2015-10-02 00:23+0000\n" +"PO-Revision-Date: 2016-07-22 22:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Persian (http://www.transifex.com/odoo/odoo-9/language/fa/)\n" "MIME-Version: 1.0\n" @@ -261,7 +261,7 @@ msgstr "" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_display_name msgid "Display Name" -msgstr "" +msgstr "نام نمایشی" #. module: web_editor #. openerp-web @@ -549,7 +549,7 @@ msgstr "" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub___last_update msgid "Last Modified on" -msgstr "" +msgstr "تاریخ آخرین بهروزرسانی" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_write_uid @@ -579,7 +579,7 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:318 #, python-format msgid "Link" -msgstr "" +msgstr "لینک" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/he.po b/addons/web_editor/i18n/he.po index eafc82bcfb9..b20ec546ce4 100644 --- a/addons/web_editor/i18n/he.po +++ b/addons/web_editor/i18n/he.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:26+0000\n" -"PO-Revision-Date: 2016-07-07 22:54+0000\n" +"PO-Revision-Date: 2016-07-23 16:37+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Hebrew (http://www.transifex.com/odoo/odoo-9/language/he/)\n" "MIME-Version: 1.0\n" @@ -261,7 +261,7 @@ msgstr "ביטול עריכה" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_display_name msgid "Display Name" -msgstr "" +msgstr "השם המוצג" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/ja.po b/addons/web_editor/i18n/ja.po index 453fa935093..c9360cb6637 100644 --- a/addons/web_editor/i18n/ja.po +++ b/addons/web_editor/i18n/ja.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:26+0000\n" -"PO-Revision-Date: 2016-06-22 06:07+0000\n" -"Last-Translator: Manami Hashi <manami@roomsfor.hk>\n" +"PO-Revision-Date: 2016-07-20 14:41+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n" "Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -269,7 +269,7 @@ msgstr "表示名" #: code:addons/web_editor/static/src/xml/editor.xml:44 #, python-format msgid "Document" -msgstr "文書" +msgstr "ドキュメント" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/pl.po b/addons/web_editor/i18n/pl.po index f5c48fd0cdb..7f1d6ee5c2e 100644 --- a/addons/web_editor/i18n/pl.po +++ b/addons/web_editor/i18n/pl.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:26+0000\n" -"PO-Revision-Date: 2016-07-07 11:51+0000\n" +"PO-Revision-Date: 2016-07-13 09:29+0000\n" "Last-Translator: Piotr Szlązak <szlazakpiotr@gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/odoo/odoo-9/language/pl/)\n" "MIME-Version: 1.0\n" @@ -1221,7 +1221,7 @@ msgstr "ir.qweb.field.image" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_integer msgid "ir.qweb.field.integer" -msgstr "" +msgstr "ir.qweb.field.integer" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_many2one diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index aad71c06b6c..001070ca7d1 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -1064,17 +1064,17 @@ var LinkDialog = Dialog.extend({ var isNewWindow = this.$('input.window-new').prop('checked'); if ($e.hasClass('email-address') && $e.val().indexOf("@") !== -1) { - self.get_data_buy_mail(def, $e, isNewWindow, label, classes); + self.get_data_buy_mail(def, $e, isNewWindow, label, classes, test); } else { - self.get_data_buy_url(def, $e, isNewWindow, label, classes); + self.get_data_buy_url(def, $e, isNewWindow, label, classes, test); } return def; }, - get_data_buy_mail: function (def, $e, isNewWindow, label, classes) { + get_data_buy_mail: function (def, $e, isNewWindow, label, classes, test) { var val = $e.val(); def.resolve(val.indexOf("mailto:") === 0 ? val : 'mailto:' + val, isNewWindow, label, classes); }, - get_data_buy_url: function (def, $e, isNewWindow, label, classes) { + get_data_buy_url: function (def, $e, isNewWindow, label, classes, test) { def.resolve($e.val(), isNewWindow, label, classes); }, save: function () { |
