[Erp5-report] r23257 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Aug 28 18:29:43 2008
New Revision: 23257

URL: http://svn.erp5.org?rev=23257&view=rev
Log:
2008-08-28 yusei
* Use Base_translateString or translateString instead of N_ for translation string.

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
    erp5/trunk/bt5/erp5_invoicing/bt/change_log
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml?rev=23257&r1=23256&r2=23257&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml Thu Aug 28 18:29:43 2008
@@ -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 @@
     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 @@
   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 @@
                             <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>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/change_log?rev=23257&r1=23256&r2=23257&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/change_log Thu Aug 28 18:29:43 2008
@@ -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.

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=23257&r1=23256&r2=23257&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Thu Aug 28 18:29:43 2008
@@ -1,1 +1,1 @@
-123
+124