[Erp5-report] r23244 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 17:09:42 CEST 2008
Author: yusei
Date: Thu Aug 28 17:09:35 2008
New Revision: 23244
URL: http://svn.erp5.org?rev=23244&view=rev
Log:
2008-08-28 yusei
* Use Base_translateString or translateString instead of N_ for translation message.
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml?rev=23244&r1=23243&r2=23244&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml Thu Aug 28 17:09:35 2008
@@ -65,14 +65,14 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>N_ = context.Base_translateString\n
+ <value> <string>Base_translateString = context.Base_translateString\n
paysheet = context\n
\n
model = paysheet.getSpecialiseValue()\n
\n
if model is None:\n
return context.Base_redirect(form_id,\n
- keep_items=dict(portal_status_message=N_(\'No Pay Sheet Model.\')))\n
+ keep_items=dict(portal_status_message=Base_translateString(\'No Pay Sheet Model.\')))\n
\n
def getPropertyFromModel(model, property_name):\n
"""Get a property from the paysheet model, or from a specialised model.\n
@@ -115,7 +115,7 @@
\n
if not batch_mode:\n
return context.Base_redirect(form_id,\n
- keep_items=dict(portal_status_message=N_(\'Pay Sheet Transaction updated.\')))\n
+ keep_items=dict(portal_status_message=Base_translateString(\'Pay Sheet Transaction updated.\')))\n
</string> </value>
</item>
<item>
@@ -168,7 +168,7 @@
<string>batch_mode</string>
<string>_getattr_</string>
<string>context</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>paysheet</string>
<string>model</string>
<string>None</string>
@@ -196,6 +196,12 @@
<value> <string>PaySheetTransaction_applyModel</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml?rev=23244&r1=23243&r2=23244&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml Thu Aug 28 17:09:35 2008
@@ -74,11 +74,11 @@
employer = paysheet.getDestinationSection()\n
employee = paysheet.getSourceSection()\n
\n
-N_ = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
\n
def redirect(msg):\n
return context.Base_redirect(form_id,\n
- keep_items=dict(portal_status_message=N_(msg)))\n
+ keep_items=dict(portal_status_message=Base_translateString(msg)))\n
\n
if not paysheet.getPriceCurrency():\n
return redirect(\'Currency is required\')\n
@@ -160,7 +160,7 @@
<string>paysheet_type</string>
<string>employer</string>
<string>employee</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>redirect</string>
<string>employer_obj</string>
<string>employee_obj</string>
@@ -187,6 +187,12 @@
<value> <string>PaySheetTransaction_checkParameters</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml?rev=23244&r1=23243&r2=23244&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml Thu Aug 28 17:09:35 2008
@@ -75,8 +75,7 @@
\n
from Products.ERP5Type.Utils import cartesianProduct\n
import pprint\n
-from Products.ERP5Type.Message import Message\n
-N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n
+from Products.ERP5Type.Message import translateString\n
\n
def sortByIntIndex(a, b):\n
return cmp(a.getIntIndex(), b.getIntIndex())\n
@@ -99,7 +98,7 @@
for model_line in model_line_list:\n
base_category_list = model_line.getVariationBaseCategoryList()\n
base_application_list = model_line.getBaseAmountTitleList()\n
- translated_base_application_list = [str(N_(x)) for x in base_application_list]\n
+ translated_base_application_list = [str(translateString(x)) for x in base_application_list]\n
base_application_list = \', \'.join(translated_base_application_list)\n
list_of_list = []\n
for base_category in base_category_list:\n
@@ -131,7 +130,7 @@
quantity = cell.getQuantity()\n
base = quantity\n
\n
- base_list = [str(N_(base_application)) for base_application in \\\n
+ base_list = [str(translateString(base_application)) for base_application in \\\n
model_line.getBaseAmountTitleList()]\n
base_name = \'+\'.join(base_list)\n
\n
@@ -285,8 +284,7 @@
<string>cartesianProduct</string>
<string>pprint</string>
<string>Products.ERP5Type.Message</string>
- <string>Message</string>
- <string>N_</string>
+ <string>translateString</string>
<string>sortByIntIndex</string>
<string>_getattr_</string>
<string>context</string>
@@ -361,6 +359,12 @@
<value> <string>PaySheetTransaction_getEditableObjectLineList</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml?rev=23244&r1=23243&r2=23244&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml Thu Aug 28 17:09:35 2008
@@ -75,8 +75,7 @@
\n
from Products.ERP5Type.Utils import cartesianProduct\n
import pprint\n
-from Products.ERP5Type.Message import Message\n
-N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n
+from Products.ERP5Type.Message import translateString\n
\n
portal = context.getPortalObject();\n
paysheet_line_list = context.contentValues(portal_type=\'Pay Sheet Line\')\n
@@ -91,7 +90,7 @@
for paysheet_line in paysheet_line_list:\n
base_category_list = paysheet_line.getVariationBaseCategoryList()\n
base_application_list = paysheet_line.getBaseAmountTitleList()\n
- translated_base_application_list = [str(N_(x)) for x in base_application_list]\n
+ translated_base_application_list = [str(translateString(x)) for x in base_application_list]\n
base_application_list = \', \'.join(translated_base_application_list)\n
payroll_service = paysheet_line.getResourceValue(portal_type=\'Payroll Service\')\n
if payroll_service is not None:\n
@@ -100,7 +99,7 @@
base_participation_list = []\n
causality = paysheet_line.getCausality()\n
\n
- base_list = [str(N_(base_application)) for base_application in \\\n
+ base_list = [str(translateString(base_application)) for base_application in \\\n
paysheet_line.getBaseAmountTitleList()]\n
base_name = \'+\'.join(base_list)\n
\n
@@ -257,8 +256,7 @@
<string>cartesianProduct</string>
<string>pprint</string>
<string>Products.ERP5Type.Message</string>
- <string>Message</string>
- <string>N_</string>
+ <string>translateString</string>
<string>_getattr_</string>
<string>context</string>
<string>portal</string>
@@ -327,6 +325,12 @@
<value> <string>PaySheetTransaction_getMovementList</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=23244&r1=23243&r2=23244&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Thu Aug 28 17:09:35 2008
@@ -1,3 +1,6 @@
+2008-08-28 yusei
+* Use Base_translateString or translateString instead of N_ for translation message.
+
2008-06-10 jerome
* Add Payroll Taxes Report
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=23244&r1=23243&r2=23244&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Thu Aug 28 17:09:35 2008
@@ -1,1 +1,1 @@
-312
+313
More information about the Erp5-report
mailing list