diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml index 5c493dfae178c75d079a4df3c68df201354da4aa..4dee100d101355995a3e134b795e0fa95887d335 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml @@ -70,7 +70,7 @@ # after the invoice_builder delivery builder has created\n # the new Sale Invoice Transaction\n #\n -from Products.ERP5Type.Message import Message\n +from Products.ERP5Type.Message import translateString\n try:\n from Products.CMFCore.WorkflowCore import WorkflowException\n except ImportError:\n @@ -81,7 +81,6 @@ except ImportError:\n pass\n \n # Return Message object, so that this message will be translated when it is rendered later.\n -N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n \n invoice = context\n \n @@ -125,7 +124,7 @@ if invoice.getSimulationState() == \'draft\':\n try :\n context.getPortalObject().portal_workflow.doActionFor(\n invoice, \'confirm_action\',\n - comment=N_(\'Initialized by Delivery Builder\'),\n + comment=translateString(\'Initialized by Delivery Builder\'),\n skip_period_validation=1)\n except WorkflowException, e:\n # The user cannot pass the transition, it\'s OK\n @@ -192,12 +191,11 @@ invoice.activate(after_path_and_method_id=(related_simulation_movement_path_list <string>related_simulation_movement_path_list</string> <string>kw</string> <string>Products.ERP5Type.Message</string> - <string>Message</string> + <string>translateString</string> <string>Products.CMFCore.WorkflowCore</string> <string>WorkflowException</string> <string>ImportError</string> <string>Exception</string> - <string>N_</string> <string>context</string> <string>invoice</string> <string>LOG</string> diff --git a/bt5/erp5_invoicing/bt/change_log b/bt5/erp5_invoicing/bt/change_log index 2e56e7db70b041cf0dc1fcd7acba3a754bea12bc..1c850073973928a39ed50471cac0fca497ef8d00 100644 --- a/bt5/erp5_invoicing/bt/change_log +++ b/bt5/erp5_invoicing/bt/change_log @@ -1,5 +1,5 @@ 2008-08-28 yusei -* Use N_ for translation string. +* Use Base_translateString or translateString instead of N_ for translation string. 2008-06-27 yusei * Start to develop version 5.2. diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index d800886d9c86731ae5c4a62b0b77c437015e00d2..a09fd8ad47268facfe50ea952d980dc5627594a2 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -123 \ No newline at end of file +124 \ No newline at end of file