[Erp5-report] r23252 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 18:03:20 CEST 2008
Author: yusei
Date: Thu Aug 28 18:03:16 2008
New Revision: 23252
URL: http://svn.erp5.org?rev=23252&view=rev
Log:
2008-08-28 yusei
* Use Base_translateString or translateString instead of N_ for translation message.
Modified:
erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml
erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
erp5/trunk/bt5/erp5_base/bt/change_log
erp5/trunk/bt5/erp5_base/bt/revision
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml?rev=23252&r1=23251&r2=23252&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml Thu Aug 28 18:03:16 2008
@@ -65,8 +65,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.ERP5Type.Message import Message\n
-N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n
+ <value> <string>from Products.ERP5Type.Message import translateString\n
\n
if id and id != context.getId():\n
container = context.getParentValue()\n
@@ -80,13 +79,13 @@
keep_items=dict(selection_name=selection_name,\n
selection_index=selection_index,\n
cancel_url=cancel_url,\n
- portal_status_message=N_("Function Changed")),)\n
+ portal_status_message=translateString("Function Changed")),)\n
\n
return context.Base_redirect(form_id,\n
keep_items=dict(selection_name=selection_name,\n
selection_index=selection_index,\n
cancel_url=cancel_url,\n
- portal_status_message=N_("Cancelled")),)\n
+ portal_status_message=translateString("Cancelled")),)\n
</string> </value>
</item>
<item>
@@ -142,8 +141,7 @@
<string>cancel_url</string>
<string>kw</string>
<string>Products.ERP5Type.Message</string>
- <string>Message</string>
- <string>N_</string>
+ <string>translateString</string>
<string>_getattr_</string>
<string>context</string>
<string>container</string>
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml?rev=23252&r1=23251&r2=23252&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml Thu Aug 28 18:03:16 2008
@@ -73,7 +73,7 @@
"""\n
from DateTime import DateTime\n
from Products.ERP5Type.DateUtils import getIntervalBetweenDates\n
-N_ = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
\n
birthday = context.getBirthday()\n
if birthday is None:\n
@@ -88,7 +88,7 @@
return interval_dict[\'year\']\n
\n
# mapping contains year, month & day\n
-return N_("${year} Years Old", mapping=interval_dict)\n
+return Base_translateString("${year} Years Old", mapping=interval_dict)\n
]]></string> </value>
@@ -140,7 +140,7 @@
<string>getIntervalBetweenDates</string>
<string>_getattr_</string>
<string>context</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>birthday</string>
<string>None</string>
<string>interval_dict</string>
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml?rev=23252&r1=23251&r2=23252&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml Thu Aug 28 18:03:16 2008
@@ -66,7 +66,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.CMFActivity.Errors import ActivityPendingError\n
-N_ = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
\n
person = context\n
career_list = []\n
@@ -77,7 +77,7 @@
\n
if default_career is None:\n
# No default career.\n
- message = N_(\'Current career must exist.\')\n
+ message = Base_translateString(\'Current career must exist.\')\n
return context.Base_redirect(form_id=form_id,\n
selection_name=selection_name,\n
selection_index=selection_index,\n
@@ -89,7 +89,7 @@
try:\n
default_career.setId(new_id)\n
except ActivityPendingError, error:\n
- message = N_("%s" % error)\n
+ message = Base_translateString("%s" % error)\n
return context.Base_redirect(form_id=form_id,\n
selection_name=selection_name,\n
selection_index=selection_index,\n
@@ -107,7 +107,7 @@
start_date=new_start_date,\n
stop_date=None)\n
\n
- message = N_(\'Last career step terminated. New career step added.\')\n
+ message = Base_translateString(\'Last career step terminated. New career step added.\')\n
return context.Base_redirect(form_id=form_id,\n
selection_name=selection_name,\n
selection_index=selection_index,\n
@@ -167,7 +167,7 @@
<string>ActivityPendingError</string>
<string>_getattr_</string>
<string>context</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>person</string>
<string>career_list</string>
<string>None</string>
Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=23252&r1=23251&r2=23252&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log Thu Aug 28 18:03:16 2008
@@ -1,3 +1,6 @@
+2008-08-28 yusei
+* Use Base_translateString or translateString instead of N_ for translation message.
+
2008-08-15 jerome
* Expose creation_date in Delivery_getODTDataDict
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=23252&r1=23251&r2=23252&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Thu Aug 28 18:03:16 2008
@@ -1,1 +1,1 @@
-409
+410
More information about the Erp5-report
mailing list