[Erp5-report] r23247 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 17:28:43 CEST 2008
Author: yusei
Date: Thu Aug 28 17:28:34 2008
New Revision: 23247
URL: http://svn.erp5.org?rev=23247&view=rev
Log:
2008-08-28 yusei
* Use Base_translateString or translateString instead of N_.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyWorkflowStatus.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml?rev=23247&r1=23246&r2=23247&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml Thu Aug 28 17:28:34 2008
@@ -69,13 +69,13 @@
request=context.REQUEST\n
portal = context.getPortalObject()\n
-N_ = portal.Base_translateString\n
+Base_translateString = portal.Base_translateString\n
\n
selected_uids = context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)\n
uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
\n
if uids == []:\n
- message = N_("Please+select+one+or+more+items+to+delete+first.")\n
+ message = Base_translateString("Please+select+one+or+more+items+to+delete+first.")\n
qs = \'?portal_status_message=%s\' % message\n
return request.RESPONSE.redirect( context.absolute_url() + \'/\' + form_id + qs )\n
\n
@@ -153,7 +153,7 @@
<string>context</string>
<string>request</string>
<string>portal</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>selected_uids</string>
<string>message</string>
<string>qs</string>
@@ -188,6 +188,12 @@
<value> <string>Delete objects from a folder</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyWorkflowStatus.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyWorkflowStatus.xml?rev=23247&r1=23246&r2=23247&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyWorkflowStatus.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyWorkflowStatus.xml Thu Aug 28 17:28:34 2008
@@ -65,9 +65,8 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.ERP5Type.Message import Message\n
+ <value> <string>from Products.ERP5Type.Message import translateString\n
\n
-N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n
request = context.REQUEST\n
portal = context.getPortalObject()\n
\n
@@ -93,7 +92,7 @@
\n
return request.RESPONSE.redirect( \'%s/%s?portal_status_message=%s\' % (\n
context.absolute_url(), form_id,\n
- N_("Workflow Modification in Progress")))\n
+ translateString("Workflow Modification in Progress")))\n
</string> </value>
</item>
<item>
@@ -147,8 +146,7 @@
<string>form_id</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>request</string>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml?rev=23247&r1=23246&r2=23247&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml Thu Aug 28 17:28:34 2008
@@ -67,7 +67,7 @@
<key> <string>_body</string> </key>
<value> <string>REQUEST=context.REQUEST\n
error_message = \'\'\n
-N_ = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
\n
if context.cb_dataValid:\n
# We first look if the content of objects to paste is allowed\n
@@ -76,24 +76,24 @@
try:\n
portal_type_list = [x.getPortalType() for x in object_list]\n
except AttributeError:\n
- error_message = N_(\'Sorry+you+can+not+paste+theses+Items+here\')\n
+ error_message = Base_translateString(\'Sorry+you+can+not+paste+theses+Items+here\')\n
else:\n
allowed_type_list = [x for x in context.getVisibleAllowedContentTypeList()]\n
for portal_type in portal_type_list:\n
if portal_type not in allowed_type_list:\n
- error_message = N_(\'Sorry+you+can+not+paste+theses+Items+here\')\n
+ error_message = Base_translateString(\'Sorry+you+can+not+paste+theses+Items+here\')\n
if context.cb_dataValid and error_message==\'\':\n
try:\n
new_item_list = context.manage_pasteObjects(REQUEST[\'__cp\'])\n
except KeyError:\n
- msg = N_(\'Nothing+To+Paste.\')\n
+ msg = Base_translateString(\'Nothing+To+Paste.\')\n
return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % msg)\n
else:\n
new_id_list = [i[\'new_id\'] for i in new_item_list]\n
for my_id in new_id_list:\n
context[my_id].flushActivity(invoke=0, method_id=\'immediateReindexObject\')\n
context[my_id].recursiveImmediateReindexObject()\n
- msg = N_(\'Item(s)+Pasted.\')\n
+ msg = Base_translateString(\'Item(s)+Pasted.\')\n
return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % msg)\n
elif context.cb_dataValid and error_message!=\'\':\n
return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % error_message)\n
@@ -146,7 +146,7 @@
<string>context</string>
<string>REQUEST</string>
<string>error_message</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>object_list</string>
<string>append</string>
<string>$append0</string>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=23247&r1=23246&r2=23247&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Thu Aug 28 17:28:34 2008
@@ -1,1 +1,1 @@
-944
+945
More information about the Erp5-report
mailing list