diff --git a/shopfloor/actions/change_package_lot.py b/shopfloor/actions/change_package_lot.py index 1a590af3ef..9c02d98a4b 100644 --- a/shopfloor/actions/change_package_lot.py +++ b/shopfloor/actions/change_package_lot.py @@ -90,8 +90,10 @@ def _change_pack_lot_change_lot( move_line.location_id, move_line.product_id, lot=lot, - name=_("Pick: stock issue on lot: {} found in {}").format( - lot.name, move_line.location_id.name + name=_( + "Pick: stock issue on lot: %(lot_name)s found in %(location_name)s", + lot_name=lot.name, + location_name=move_line.location_id.name, ), ) message = self.msg_store.cannot_change_lot_already_picked(lot) diff --git a/shopfloor/actions/completion_info.py b/shopfloor/actions/completion_info.py index 59783f732a..5892e85073 100644 --- a/shopfloor/actions/completion_info.py +++ b/shopfloor/actions/completion_info.py @@ -34,10 +34,9 @@ def popup(self, move_lines): return None return { "body": _( - "Last operation of transfer {}. " - "Next operation ({}) is ready to proceed." - ).format( - ", ".join(pickings.mapped("name")), - ", ".join(next_pickings.mapped("name")), + "Last operation of transfer %(picking_names)s. " + "Next operation (%(next_picking_names)s) is ready to proceed.", + picking_names=", ".join(pickings.mapped("name")), + next_picking_names=", ".join(next_pickings.mapped("name")), ) } diff --git a/shopfloor/actions/message.py b/shopfloor/actions/message.py index ceae5c4428..4ec508f999 100644 --- a/shopfloor/actions/message.py +++ b/shopfloor/actions/message.py @@ -112,9 +112,9 @@ def package_different_change(self): def package_not_available_in_picking(self, package, picking): return { "message_type": "warning", - "body": _("Package {} is not available in transfer {}.").format( - package.name, picking.name - ), + "body": _( + "Package %(package_name)s is not available in transfer %(picking_name)s." + ).format(package.name, picking.name), } def package_not_empty(self, package): @@ -352,8 +352,11 @@ def package_change_error_same_package(self, package): def x_units_put_in_package(self, qty, product, package): return { "message_type": "success", - "body": _("{} {} put in {}").format( - qty, product.display_name, package.name + "body": _( + "%(qty)s %(product_name)s put in %(package_name)s", + qty=qty, + product_name=product.display_name, + package_name=package.name, ), } @@ -536,9 +539,9 @@ def location_content_transfer_item_complete(self, location_dest): def location_content_transfer_complete(self, location_src, location_dest): return { "message_type": "success", - "body": _("Content transferred from {} to {}.").format( - location_src.name, location_dest.name - ), + "body": _( + "Content transferred from %(location_name)s to %(location_dest_name)s." + ).format(location_src.name, location_dest.name), } def location_content_unable_to_transfer(self, location_dest): @@ -686,23 +689,28 @@ def unable_to_pick_more(self, quantity): def lot_replaced_by_lot(self, old_lot, new_lot): return { "message_type": "success", - "body": _("Lot {} replaced by lot {}.").format(old_lot.name, new_lot.name), + "body": _("Lot %(old_lot_name)s replaced by lot %(new_lot_name)s.").format( + old_lot.name, new_lot.name + ), } def package_replaced_by_package(self, old_package, new_package): return { "message_type": "success", - "body": _("Package {} replaced by package {}.").format( - old_package.name, new_package.name - ), + "body": _( + "Package %(old_package_name)s replaced by package %(new_package_name)s." + ).format(old_package.name, new_package.name), } def package_already_picked_by(self, package, picking): return { "message_type": "error", "body": _( - "Package {} cannot be picked, already moved by transfer {}." - ).format(package.name, picking.name), + "Package %(package_name)s cannot be picked, already moved " + "by transfer %(picking_name)s.", + package_name=package.name, + picking_name=picking.name, + ), } def units_replaced_by_package(self, new_package): @@ -714,7 +722,11 @@ def units_replaced_by_package(self, new_package): def package_change_error(self, package, error_msg): return { "message_type": "error", - "body": _("Package {} cannot be used: {} ").format(package.name, error_msg), + "body": _( + "Package %(package_name)s cannot be used: %(error)s", + package_name=package.name, + error=error_msg, + ), } def cannot_change_lot_already_picked(self, lot): @@ -764,8 +776,11 @@ def package_open(self): def packaging_invalid_for_carrier(self, packaging, carrier): return { "message_type": "error", - "body": _("Packaging '{}' is not allowed for carrier {}.").format( - packaging.name if packaging else _("No value"), carrier.name + "body": _( + "Packaging '%(package_name)s' is not allowed for carrier " + "%(carrier_name)s.or carrier %(carrier_name)s.", + package_name=packaging.name if packaging else _("No value"), + carrier_name=carrier.name, ), } diff --git a/shopfloor/i18n/ca.po b/shopfloor/i18n/ca.po index 106fe2520a..3ce6a599bf 100644 --- a/shopfloor/i18n/ca.po +++ b/shopfloor/i18n/ca.po @@ -277,7 +277,7 @@ msgstr "Transferència de contingut a {} competada" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Content transferred from {} to {}." +msgid "Content transferred from %(location_name)s to %(location_dest_name)s." msgstr "Contingut transferit de {} a {}." #. module: shopfloor @@ -459,7 +459,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/completion_info.py:0 #, python-format -msgid "Last operation of transfer {}. Next operation ({}) is ready to proceed." +msgid "Last operation of transfer %(picking_names)s. Next operation (%(next_picking_names)s) is ready to " msgstr "" #. module: shopfloor @@ -538,7 +538,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Lot {} replaced by lot {}." +msgid "Lot %(old_lot_name)s replaced by lot %(new_lot_name)s." msgstr "" #. module: shopfloor @@ -816,13 +816,13 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be picked, already moved by transfer {}." +msgid "Package %(package_name)s cannot be picked, already moved by transfer %(picking_name)s." msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be used: {} " +msgid "Package %(package_name)s cannot be used: %(error)s" msgstr "" #. module: shopfloor @@ -853,7 +853,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} is not available in transfer {}." +msgid "Package %(package_name)s is not available in transfer %(picking_name)s." msgstr "" #. module: shopfloor @@ -871,7 +871,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} replaced by package {}." +msgid "Package %(old_package_name)s replaced by package %(new_package_name)s." msgstr "" #. module: shopfloor @@ -882,7 +882,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Packaging '{}' is not allowed for carrier {}." +msgid "Packaging '%(package_name)s' is not allowed for carrier %(carrier_name)s." msgstr "" #. module: shopfloor @@ -918,7 +918,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/change_package_lot.py:0 #, python-format -msgid "Pick: stock issue on lot: {} found in {}" +msgid "Pick: stock issue on lot: %(lot_name)s found in %(location_name)s" msgstr "" #. module: shopfloor @@ -1115,9 +1115,9 @@ msgstr "" #: code:addons/shopfloor/models/shopfloor_menu.py:0 #, python-format msgid "" -"Scenario `{}` require(s) 'Move Entire Packages' to be enabled.\n" +"Scenario `%(scenario_name)s` require(s) 'Move Entire Packages' to be enabled.\n" "These type(s) do not satisfy this constraint: \n" -"{}.\n" +"%(bad_picking_types)s.\n" "Please, adjust your configuration." msgstr "" @@ -1791,7 +1791,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "{} {} put in {}" +msgid "%(qty)s %(product_name)s put in %(package_name)s" msgstr "" #~ msgid "" diff --git a/shopfloor/i18n/de.po b/shopfloor/i18n/de.po index e500dddab7..48796b5a6c 100644 --- a/shopfloor/i18n/de.po +++ b/shopfloor/i18n/de.po @@ -275,7 +275,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Content transferred from {} to {}." +msgid "Content transferred from %(location_name)s to %(location_dest_name)s." msgstr "" #. module: shopfloor @@ -455,7 +455,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/completion_info.py:0 #, python-format -msgid "Last operation of transfer {}. Next operation ({}) is ready to proceed." +msgid "Last operation of transfer %(picking_names)s. Next operation (%(next_picking_names)s) is ready to " msgstr "" #. module: shopfloor @@ -534,7 +534,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Lot {} replaced by lot {}." +msgid "Lot %(old_lot_name)s replaced by lot %(new_lot_name)s." msgstr "" #. module: shopfloor @@ -812,20 +812,20 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be picked, already moved by transfer {}." +msgid "Package %(package_name)s cannot be picked, already moved by transfer %(picking_name)s." msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be used: {} " +msgid "Package %(package_name)s cannot be used: %(error)s" msgstr "" #. module: shopfloor #: code:addons/shopfloor/models/stock_move_line.py:0 #, python-format msgid "" -"Package {} does not contain available product {}, cannot replace package." +"Package %(package_name)s does not contain available product %(product_name)s, cannot replace package." msgstr "" #. module: shopfloor @@ -849,7 +849,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} is not available in transfer {}." +msgid "Package %(package_name)s is not available in transfer %(picking_name)s." msgstr "" #. module: shopfloor @@ -867,7 +867,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} replaced by package {}." +msgid "Package %(old_package_name)s replaced by package %(new_package_name)s." msgstr "" #. module: shopfloor @@ -878,7 +878,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Packaging '{}' is not allowed for carrier {}." +msgid "Packaging '%(package_name)s' is not allowed for carrier %(carrier_name)s." msgstr "" #. module: shopfloor @@ -914,7 +914,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/change_package_lot.py:0 #, python-format -msgid "Pick: stock issue on lot: {} found in {}" +msgid "Pick: stock issue on lot: %(lot_name)s found in %(location_name)s" msgstr "" #. module: shopfloor @@ -1111,9 +1111,9 @@ msgstr "" #: code:addons/shopfloor/models/shopfloor_menu.py:0 #, python-format msgid "" -"Scenario `{}` require(s) 'Move Entire Packages' to be enabled.\n" +"Scenario `%(scenario_name)s` require(s) 'Move Entire Packages' to be enabled.\n" "These type(s) do not satisfy this constraint: \n" -"{}.\n" +"%(bad_picking_types)s.\n" "Please, adjust your configuration." msgstr "" @@ -1787,5 +1787,5 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "{} {} put in {}" +msgid "%(qty)s %(product_name)s put in %(package_name)s" msgstr "" diff --git a/shopfloor/i18n/es_AR.po b/shopfloor/i18n/es_AR.po index 06d626f913..2760c31591 100644 --- a/shopfloor/i18n/es_AR.po +++ b/shopfloor/i18n/es_AR.po @@ -309,8 +309,8 @@ msgstr "Transferencia de contenido a {} completada" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Content transferred from {} to {}." -msgstr "Transferencia de contenido desde {} hacia {}." +msgid "Content transferred from %(location_name)s to %(location_dest_name)s." +msgstr "Transferencia de contenido desde %(location_name)s hacia %(location_dest_name)s." #. module: shopfloor #: code:addons/shopfloor/actions/inventory.py:0 @@ -499,9 +499,9 @@ msgstr "Última Modificación el" #. module: shopfloor #: code:addons/shopfloor/actions/completion_info.py:0 #, python-format -msgid "Last operation of transfer {}. Next operation ({}) is ready to proceed." +msgid "Last operation of transfer %(picking_names)s. Next operation (%(next_picking_names)s) is ready to " msgstr "" -"Última operación de transferencia: {}. Siguiente operación ({}) está lista " +"Última operación de transferencia: %(picking_names)s. Siguiente operación (%(next_picking_names)s) está lista " "para proceder." #. module: shopfloor @@ -582,8 +582,8 @@ msgstr "El Lote {} es para otro producto." #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Lot {} replaced by lot {}." -msgstr "Lote {} reemplazado por lote {}." +msgid "Lot %(old_lot_name)s replaced by lot %(new_lot_name)s." +msgstr "Lote %(old_lot_name)s reemplazado por lote %(new_lot_name)s." #. module: shopfloor #: code:addons/shopfloor/actions/inventory.py:0 @@ -865,24 +865,24 @@ msgstr "El Paquete {} pertenece a una entrega sin un estado válido." #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be picked, already moved by transfer {}." +msgid "Package %(package_name)s cannot be picked, already moved by transfer %(picking_name)s." msgstr "" -"El Paquete {} no puede ser seleccionado, ya ha sido movido por la " -"transferencia {}." +"El Paquete %(package_name)s no puede ser seleccionado, ya ha sido movido por la " +"transferencia %(picking_name)s." #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be used: {} " -msgstr "El Paquete {} no puede ser usado: {} " +msgid "Package %(package_name)s cannot be used: %(error)s" +msgstr "El Paquete %(package_name)s no puede ser usado: %(error)s" #. module: shopfloor #: code:addons/shopfloor/models/stock_move_line.py:0 #, python-format msgid "" -"Package {} does not contain available product {}, cannot replace package." +"Package %(package_name)s does not contain available product %(product_name)s, cannot replace package." msgstr "" -"El Paquete {} no contiene un producto disponible {}, no se puede reemplazar " +"El Paquete %(package_name)s no contiene un producto disponible %(product_name)s, no se puede reemplazar " "el paquete." #. module: shopfloor @@ -906,8 +906,8 @@ msgstr "El Paquete {} está usado." #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} is not available in transfer {}." -msgstr "El Paquete {} no está disponible en la transferencia {}." +msgid "Package %(package_name)s is not available in transfer %(picking_name)s." +msgstr "El Paquete %(package_name)s no está disponible en la transferencia %(picking_name)s." #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 @@ -924,8 +924,8 @@ msgstr "El Paquete {} no está en la transferencia actual." #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} replaced by package {}." -msgstr "El Paquete {} está reemplazado por el paquete {}." +msgid "Package %(old_package_name)s replaced by package %(new_package_name)s." +msgstr "El Paquete %(old_package_name)s está reemplazado por el paquete %(new_package_name)s." #. module: shopfloor #: model:ir.model,name:shopfloor.model_stock_quant_package @@ -935,8 +935,8 @@ msgstr "Paquetes" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Packaging '{}' is not allowed for carrier {}." -msgstr "El Paquete '{}' no está permitido para el transportista {}." +msgid "Packaging '%(package_name)s' is not allowed for carrier %(carrier_name)s." +msgstr "El Paquete '%(package_name)s' no está permitido para el transportista %(carrier_name)s." #. module: shopfloor #: code:addons/shopfloor/services/checkout.py:0 @@ -973,8 +973,8 @@ msgstr "Pick y pack al mismo tiempo" #. module: shopfloor #: code:addons/shopfloor/actions/change_package_lot.py:0 #, python-format -msgid "Pick: stock issue on lot: {} found in {}" -msgstr "Entrega: error de inventario en el lote: {} encontrado en {}" +msgid "Pick: stock issue on lot: %(lot_name)s found in %(location_name)s" +msgstr "Entrega: error de inventario en el lote: %(lot_name)s encontrado en %(location_name)s" #. module: shopfloor #: model:ir.model.fields,field_description:shopfloor.field_stock_package_level__picking_id @@ -1175,14 +1175,14 @@ msgstr "Escanear el paquete" #: code:addons/shopfloor/models/shopfloor_menu.py:0 #, python-format msgid "" -"Scenario `{}` require(s) 'Move Entire Packages' to be enabled.\n" +"Scenario `%(scenario_name)s` require(s) 'Move Entire Packages' to be enabled.\n" "These type(s) do not satisfy this constraint: \n" -"{}.\n" +"%(bad_picking_types)s.\n" "Please, adjust your configuration." msgstr "" -"El escenario `{}` requiere que se habilite 'Mover paquetes completos'.\n" +"El escenario `%(scenario_name)s` requiere que se habilite 'Mover paquetes completos'.\n" "Estos tipos no satisfacen esta restricción:\n" -"{}.\n" +"%(bad_picking_types)s.\n" "Por favor, ajuste su configuración." #. module: shopfloor @@ -1896,8 +1896,8 @@ msgstr "{} no encontrado en la transferencia actual o ya está en un paquete." #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "{} {} put in {}" -msgstr "{} {} poner en {}" +msgid "%(qty)s %(product_name)s put in %(package_name)s" +msgstr "%(qty)s %(product_name)s poner en %(package_name)s" #, python-format #~ msgid "No line to pack found" diff --git a/shopfloor/i18n/pt_BR.po b/shopfloor/i18n/pt_BR.po index 7fe2bd65ca..af2e46e5cc 100644 --- a/shopfloor/i18n/pt_BR.po +++ b/shopfloor/i18n/pt_BR.po @@ -275,7 +275,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Content transferred from {} to {}." +msgid "Content transferred from %(location_name)s to %(location_dest_name)s." msgstr "" #. module: shopfloor @@ -455,7 +455,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/completion_info.py:0 #, python-format -msgid "Last operation of transfer {}. Next operation ({}) is ready to proceed." +msgid "Last operation of transfer %(picking_names)s. Next operation (%(next_picking_names)s) is ready to " msgstr "" #. module: shopfloor @@ -534,7 +534,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Lot {} replaced by lot {}." +msgid "Lot %(old_lot_name)s replaced by lot %(new_lot_name)s." msgstr "" #. module: shopfloor @@ -812,20 +812,20 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be picked, already moved by transfer {}." +msgid "Package %(package_name)s cannot be picked, already moved by transfer %(picking_name)s." msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be used: {} " +msgid "Package %(package_name)s cannot be used: %(error)s" msgstr "" #. module: shopfloor #: code:addons/shopfloor/models/stock_move_line.py:0 #, python-format msgid "" -"Package {} does not contain available product {}, cannot replace package." +"Package %(package_name)s does not contain available product %(product_name)s, cannot replace package." msgstr "" #. module: shopfloor @@ -849,7 +849,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} is not available in transfer {}." +msgid "Package %(package_name)s is not available in transfer %(picking_name)s." msgstr "" #. module: shopfloor @@ -867,7 +867,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} replaced by package {}." +msgid "Package %(old_package_name)s replaced by package %(new_package_name)s." msgstr "" #. module: shopfloor @@ -878,7 +878,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Packaging '{}' is not allowed for carrier {}." +msgid "Packaging '%(package_name)s' is not allowed for carrier %(carrier_name)s." msgstr "" #. module: shopfloor @@ -914,7 +914,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/change_package_lot.py:0 #, python-format -msgid "Pick: stock issue on lot: {} found in {}" +msgid "Pick: stock issue on lot: %(lot_name)s found in %(location_name)s" msgstr "" #. module: shopfloor @@ -1111,9 +1111,9 @@ msgstr "" #: code:addons/shopfloor/models/shopfloor_menu.py:0 #, python-format msgid "" -"Scenario `{}` require(s) 'Move Entire Packages' to be enabled.\n" +"Scenario `%(scenario_name)s` require(s) 'Move Entire Packages' to be enabled.\n" "These type(s) do not satisfy this constraint: \n" -"{}.\n" +"%(bad_picking_types)s.\n" "Please, adjust your configuration." msgstr "" @@ -1787,5 +1787,5 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "{} {} put in {}" +msgid "%(qty)s %(product_name)s put in %(package_name)s" msgstr "" diff --git a/shopfloor/i18n/shopfloor.pot b/shopfloor/i18n/shopfloor.pot index 720d1a38ac..3a2ece59d5 100644 --- a/shopfloor/i18n/shopfloor.pot +++ b/shopfloor/i18n/shopfloor.pot @@ -271,7 +271,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Content transferred from {} to {}." +msgid "Content transferred from %(location_name)s to %(location_dest_name)s." msgstr "" #. module: shopfloor @@ -452,7 +452,7 @@ msgstr "" #: code:addons/shopfloor/actions/completion_info.py:0 #, python-format msgid "" -"Last operation of transfer {}. Next operation ({}) is ready to proceed." +"Last operation of transfer %(picking_names)s. Next operation (%(next_picking_names)s) is ready to " msgstr "" #. module: shopfloor @@ -531,7 +531,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Lot {} replaced by lot {}." +msgid "Lot %(old_lot_name)s replaced by lot %(new_lot_name)s." msgstr "" #. module: shopfloor @@ -809,20 +809,20 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be picked, already moved by transfer {}." +msgid "Package %(package_name)s cannot be picked, already moved by transfer %(picking_name)s." msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} cannot be used: {} " +msgid "Package %(package_name)s cannot be used: %(error)s" msgstr "" #. module: shopfloor #: code:addons/shopfloor/models/stock_move_line.py:0 #, python-format msgid "" -"Package {} does not contain available product {}, cannot replace package." +"Package %(package_name)s does not contain available product %(product_name)s, cannot replace package." msgstr "" #. module: shopfloor @@ -846,7 +846,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} is not available in transfer {}." +msgid "Package %(package_name)s is not available in transfer %(picking_name)s." msgstr "" #. module: shopfloor @@ -864,7 +864,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Package {} replaced by package {}." +msgid "Package %(old_package_name)s replaced by package %(new_package_name)s." msgstr "" #. module: shopfloor @@ -875,7 +875,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "Packaging '{}' is not allowed for carrier {}." +msgid "Packaging '%(package_name)s' is not allowed for carrier %(carrier_name)s." msgstr "" #. module: shopfloor @@ -911,7 +911,7 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/change_package_lot.py:0 #, python-format -msgid "Pick: stock issue on lot: {} found in {}" +msgid "Pick: stock issue on lot: %(lot_name)s found in %(location_name)s" msgstr "" #. module: shopfloor @@ -1109,9 +1109,9 @@ msgstr "" #: code:addons/shopfloor/models/shopfloor_menu.py:0 #, python-format msgid "" -"Scenario `{}` require(s) 'Move Entire Packages' to be enabled.\n" +"Scenario `%(scenario_name)s` require(s) 'Move Entire Packages' to be enabled.\n" "These type(s) do not satisfy this constraint: \n" -"{}.\n" +"%(bad_picking_types)s.\n" "Please, adjust your configuration." msgstr "" @@ -1787,5 +1787,5 @@ msgstr "" #. module: shopfloor #: code:addons/shopfloor/actions/message.py:0 #, python-format -msgid "{} {} put in {}" +msgid "%(qty)s %(product_name)s put in %(package_name)s" msgstr "" diff --git a/shopfloor/models/shopfloor_menu.py b/shopfloor/models/shopfloor_menu.py index d78fc7b0f0..bf4af32032 100644 --- a/shopfloor/models/shopfloor_menu.py +++ b/shopfloor/models/shopfloor_menu.py @@ -372,11 +372,14 @@ def _check_move_entire_packages(self): scenario_name = menu.scenario_id.name raise exceptions.ValidationError( _( - "Scenario `{}` require(s) " + "Scenario `%(scenario_name)s` require(s) " "'Move Entire Packages' to be enabled.\n" - "These type(s) do not satisfy this constraint: \n{}.\n" - "Please, adjust your configuration." - ).format(scenario_name, "\n- ".join(bad_picking_types)) + "These type(s) do not satisfy this constraint: " + "\n%(bad_picking_types)s.\n" + "Please, adjust your configuration.", + scenario_name=scenario_name, + bad_picking_types="\n- ".join(bad_picking_types), + ) ) @api.depends("scenario_id") diff --git a/shopfloor/models/stock_move_line.py b/shopfloor/models/stock_move_line.py index 45eb077fd8..05a470fc91 100644 --- a/shopfloor/models/stock_move_line.py +++ b/shopfloor/models/stock_move_line.py @@ -251,9 +251,11 @@ def is_lesser(value, other, rounding): if not quant: raise exceptions.UserError( _( - "Package {} does not contain available product {}," - " cannot replace package." - ).format(new_package.display_name, self.product_id.display_name) + "Package %(package_name)s does not contain available product " + "%(product_name)s, cannot replace package.", + package_name=new_package.display_name, + product_name=self.product_id.display_name, + ) ) values = { diff --git a/test-requirements.txt b/test-requirements.txt index 973d39fff6..689482e20d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,2 @@ vcrpy-unittest odoo_test_helper -