diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot index 3efe35d4db3..c5c3c343c5e 100644 --- a/addons/website_sale_delivery/i18n/website_sale_delivery.pot +++ b/addons/website_sale_delivery/i18n/website_sale_delivery.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-21 14:09+0000\n" -"PO-Revision-Date: 2015-01-21 14:09+0000\n" +"POT-Creation-Date: 2015-07-31 09:26+0000\n" +"PO-Revision-Date: 2015-07-31 09:26+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -50,11 +50,23 @@ msgstr "" msgid "Description for the website" msgstr "" +#. module: website_sale_delivery +#: code:addons/website_sale_delivery/models/sale_order.py:109 +#, python-format +msgid "No shipping method is available for your current order and shipping address. Please contact us for more information." +msgstr "" + #. module: website_sale_delivery #: model:ir.model,name:website_sale_delivery.model_sale_order msgid "Sales Order" msgstr "" +#. module: website_sale_delivery +#: code:addons/website_sale_delivery/models/sale_order.py:108 +#, python-format +msgid "Sorry, we are unable to ship your order" +msgstr "" + #. module: website_sale_delivery #: help:sale.order,amount_delivery:0 msgid "The amount without tax." diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py index 460b8309b8d..4d52eca513c 100644 --- a/addons/website_sale_delivery/models/sale_order.py +++ b/addons/website_sale_delivery/models/sale_order.py @@ -3,6 +3,7 @@ from openerp.osv import orm, fields from openerp import SUPERUSER_ID from openerp.addons import decimal_precision +from openerp.tools.translate import _ class delivery_carrier(orm.Model): @@ -103,7 +104,10 @@ class SaleOrder(orm.Model): def _get_errors(self, cr, uid, order, context=None): errors = super(SaleOrder, self)._get_errors(cr, uid, order, context=context) if not self._get_delivery_methods(cr, uid, order, context=context): - errors.append(('No delivery method available', 'There is no available delivery method for your order')) + errors.append( + (_('Sorry, we are unable to ship your order'), + _('No shipping method is available for your current order and shipping address. ' + 'Please contact us for more information.'))) return errors def _get_website_data(self, cr, uid, order, context=None):