[Erp5-report] r23250 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 17:39:36 CEST 2008
Author: yusei
Date: Thu Aug 28 17:39:27 2008
New Revision: 23250
URL: http://svn.erp5.org?rev=23250&view=rev
Log:
2008-08-28 yusei
* Use Base_translateString or translateString instead of N_ for translation message.
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
erp5/trunk/bt5/erp5_trade/bt/change_log
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml?rev=23250&r1=23249&r2=23250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml Thu Aug 28 17:39:27 2008
@@ -65,16 +65,14 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.ERP5Type.Message import Message\n
-\n
-N_ = lambda msg, **kw: str(Message(\'erp5_ui\', msg, **kw))\n
+ <value> <string>from Products.ERP5Type.Message import translateString\n
\n
packing_list = context\n
\n
# Modify state\n
packing_list_state = packing_list.getSimulationState()\n
if packing_list_state == "draft":\n
- packing_list.confirm(comment=N_(\'Initialized by Delivery Builder\'))\n
+ packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder\'))\n
</string> </value>
</item>
<item>
@@ -125,8 +123,7 @@
<tuple>
<string>kw</string>
<string>Products.ERP5Type.Message</string>
- <string>Message</string>
- <string>N_</string>
+ <string>translateString</string>
<string>context</string>
<string>packing_list</string>
<string>_getattr_</string>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml?rev=23250&r1=23249&r2=23250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml Thu Aug 28 17:39:27 2008
@@ -71,7 +71,7 @@
# and tries to complete some fields\n
\n
order = context\n
-N_ = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
trade_condition_portal_type = \'Purchase Trade Condition\'\n
\n
trade_condition_list = order.getSpecialiseValueList(\n
@@ -97,7 +97,7 @@
\n
if len(trade_condition_list ) == 0 :\n
redirect_url = \'%s/%s?%s\' % ( context.absolute_url(), form_id,\n
- \'portal_status_message=\' + N_(\'No Trade Condition.\'))\n
+ \'portal_status_message=\' + Base_translateString(\'No Trade Condition.\'))\n
else :\n
# if more than one trade condition is found, simply apply the first one\n
trade_condition=trade_condition_list[0].getObject()\n
@@ -105,7 +105,7 @@
order.Order_applyTradeCondition(trade_condition, force=force)\n
\n
redirect_url = \'%s/%s?%s\' % (context.absolute_url(), form_id,\n
- \'portal_status_message=\' + N_(\'Order updated.\'))\n
+ \'portal_status_message=\' + Base_translateString(\'Order updated.\'))\n
\n
if batch_mode:\n
return\n
@@ -166,7 +166,7 @@
<string>context</string>
<string>order</string>
<string>_getattr_</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>trade_condition_portal_type</string>
<string>trade_condition_list</string>
<string>tested_base_category_list</string>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml?rev=23250&r1=23249&r2=23250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml Thu Aug 28 17:39:27 2008
@@ -71,7 +71,7 @@
# and tries to complete some fields\n
\n
order = context\n
-N_ = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
trade_condition_portal_type = \'Sale Trade Condition\'\n
\n
trade_condition_list = order.getSpecialiseValueList(\n
@@ -97,7 +97,7 @@
\n
if len(trade_condition_list ) == 0 :\n
redirect_url = \'%s/%s?%s\' % ( context.absolute_url(), form_id,\n
- \'portal_status_message=\' + N_(\'No Trade Condition.\'))\n
+ \'portal_status_message=\' + Base_translateString(\'No Trade Condition.\'))\n
else :\n
# if more than one trade condition is found, simply apply the first one\n
trade_condition=trade_condition_list[0].getObject()\n
@@ -108,7 +108,7 @@
context.setReceivedDate(DateTime())\n
\n
redirect_url = \'%s/%s?%s\' % (context.absolute_url(), form_id,\n
- \'portal_status_message=\' + N_(\'Order updated.\'))\n
+ \'portal_status_message=\' + Base_translateString(\'Order updated.\'))\n
\n
if batch_mode:\n
return\n
@@ -169,7 +169,7 @@
<string>context</string>
<string>order</string>
<string>_getattr_</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>trade_condition_portal_type</string>
<string>trade_condition_list</string>
<string>tested_base_category_list</string>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml?rev=23250&r1=23249&r2=23250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml Thu Aug 28 17:39:27 2008
@@ -68,9 +68,7 @@
<value> <string>if related_simulation_movement_path_list is None:\n
raise RuntimeError, \'related_simulation_movement_path_list is missing. Update ERP5 Product.\'\n
\n
-from Products.ERP5Type.Message import Message\n
-\n
-N_ = lambda msg, **kw: str(Message(\'erp5_ui\', msg, **kw))\n
+from Products.ERP5Type.Message import translateString\n
\n
packing_list = context\n
\n
@@ -81,7 +79,7 @@
packing_list_state = packing_list.getSimulationState()\n
\n
if packing_list_state == "draft":\n
- packing_list.confirm(comment=N_(\'Initialized by Delivery Builder\'))\n
+ packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder\'))\n
\n
# First set the packing_list in the building state\n
packing_list.startBuilding()\n
@@ -134,8 +132,7 @@
<string>None</string>
<string>RuntimeError</string>
<string>Products.ERP5Type.Message</string>
- <string>Message</string>
- <string>N_</string>
+ <string>translateString</string>
<string>context</string>
<string>packing_list</string>
<string>_getattr_</string>
Modified: erp5/trunk/bt5/erp5_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/change_log?rev=23250&r1=23249&r2=23250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_trade/bt/change_log Thu Aug 28 17:39:27 2008
@@ -1,5 +1,5 @@
2008-08-28 yusei
-* Use N_ function for translation message.
+* Use Base_translateString or translateString instead of N_ for translation message.
2008-07-30 Jerome
Add "offered" and "rejected" state on order workflow, to manage offers.
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=23250&r1=23249&r2=23250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Thu Aug 28 17:39:27 2008
@@ -1,1 +1,1 @@
-474
+475
More information about the Erp5-report
mailing list