[Erp5-report] r23255 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplate...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 18:26:05 CEST 2008
Author: yusei
Date: Thu Aug 28 18:26:01 2008
New Revision: 23255
URL: http://svn.erp5.org?rev=23255&view=rev
Log:
2008-08-28 yusei
* Use Base_translateString or translateString instead of N_ for translation message.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_uploadContributeContent.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Folder_create.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml?rev=23255&r1=23254&r2=23255&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml Thu Aug 28 18:26:01 2008
@@ -66,7 +66,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>def getModuleActionInformationDict(**kw):\n
- N_ = context.Base_translateString\n
+ Base_translateString = context.Base_translateString\n
result_dict = {}\n
\n
# If the user is not allowed to get the category, return immediately.\n
@@ -134,7 +134,7 @@
form_id=form_id,\n
selection_name=selection_name,\n
select_action=action))\n
- module_add_list.append((N_(content_type), url))\n
+ module_add_list.append((Base_translateString(content_type), url))\n
for template in module.getDocumentTemplateList():\n
action = \'template %s\' % template.getRelativeUrl()\n
url = renderCustomLink(\'%s/Base_doAction\' % module_url,\n
@@ -142,8 +142,8 @@
form_id=form_id,\n
selection_name=selection_name,\n
select_action=action))\n
- template_name = N_(\'${template_title} (Template)\',\n
- mapping=dict(template_title=template.getTitle()))\n
+ template_name = Base_translateString(\'${template_title} (Template)\',\n
+ mapping=dict(template_title=template.getTitle()))\n
module_add_list.append((template_name, url))\n
for add_action in action_dict.get(\'object_add\', ()):\n
url = renderCustomLink(add_action[\'url\'],\n
@@ -151,7 +151,7 @@
form_id=form_id,\n
selection_name=selection_name,\n
select_action=action))\n
- module_add_list.append((N_(add_action[\'name\']), url))\n
+ module_add_list.append((Base_translateString(add_action[\'name\']), url))\n
if module_add_list:\n
add_list.append((translated_title, module_add_list))\n
\n
@@ -163,7 +163,7 @@
form_id=form_id,\n
selection_name=selection_name,\n
dialog_category=\'object_search\')).strip()\n
- module_search_list.append((N_(search_action[\'name\']), url))\n
+ module_search_list.append((Base_translateString(search_action[\'name\']), url))\n
if module_search_list:\n
search_list.append((translated_title, module_search_list))\n
\n
@@ -175,7 +175,7 @@
form_id=form_id,\n
selection_name=selection_name,\n
dialog_category=\'object_exchange\')).strip()\n
- module_exchange_list.append((N_(exchange_action[\'name\']), url))\n
+ module_exchange_list.append((Base_translateString(exchange_action[\'name\']), url))\n
if module_exchange_list:\n
exchange_list.append((translated_title, module_exchange_list))\n
\n
@@ -187,7 +187,7 @@
form_id=form_id,\n
selection_name=selection_name,\n
dialog_category=\'object_report\')).strip()\n
- module_report_list.append((N_(report_action[\'name\']), url))\n
+ module_report_list.append((Base_translateString(report_action[\'name\']), url))\n
if module_report_list:\n
report_list.append((translated_title, module_report_list))\n
\n
@@ -199,7 +199,7 @@
form_id=form_id,\n
selection_name=selection_name,\n
dialog_category=\'object_print\')).strip()\n
- module_print_list.append((N_(print_action[\'name\']), url))\n
+ module_print_list.append((Base_translateString(print_action[\'name\']), url))\n
if module_print_list:\n
print_list.append((translated_title, module_print_list))\n
\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_uploadContributeContent.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_uploadContributeContent.xml?rev=23255&r1=23254&r2=23255&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_uploadContributeContent.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_uploadContributeContent.xml Thu Aug 28 18:26:01 2008
@@ -65,7 +65,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>N_ = context.Base_translateString\n
+ <value> <string>Base_translateString = context.Base_translateString\n
REQUEST = context.REQUEST\n
portal = context.getPortalObject()\n
contribute_file = REQUEST.get(\'contribute_file\', None)\n
@@ -75,7 +75,7 @@
\n
\n
if contribute_file is None or not contribute_file.filename:\n
- portal_status_message = N_(\'Please select upload file.\')\n
+ portal_status_message = Base_translateString(\'Please select upload file.\')\n
keep_items={\'portal_status_message\':portal_status_message}\n
portal.Base_redirect(form_view=\'view\', keep_items=keep_items)\n
return\n
@@ -132,7 +132,7 @@
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>REQUEST</string>
<string>portal</string>
<string>None</string>
@@ -161,6 +161,12 @@
<value> <string>ERP5Site_uploadContributeContent</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_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml?rev=23255&r1=23254&r2=23255&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml Thu Aug 28 18:26:01 2008
@@ -66,7 +66,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
-N_ = portal.Base_translateString\n
+Base_translateString = portal.Base_translateString\n
preserved_parameters={\'form_id\': form_id, \'cancel_url\': cancel_url}\n
request = context.REQUEST\n
\n
@@ -101,7 +101,7 @@
new_content = context.newContent(portal_type=type_name,\n
container=context,\n
id=str(new_id))\n
- preserved_parameters[\'portal_status_message\'] = N_("Object Created.")\n
+ preserved_parameters[\'portal_status_message\'] = Base_translateString("Object Created.")\n
preserved_parameters[\'editable_mode\'] = 1\n
redirect_url = \'%s/view\' % (new_content.absolute_url(), )\n
# The created object is not a part of the selection, so prevent from displaying the selection navigation controls\n
@@ -118,14 +118,14 @@
new_content_id = new_content_list[0][\'new_id\']\n
new_content = context[new_content_id]\n
new_content.makeTemplateInstance()\n
- preserved_parameters[\'portal_status_message\'] = N_("Template Created.")\n
+ preserved_parameters[\'portal_status_message\'] = Base_translateString("Template Created.")\n
redirect_url = \'%s/view\' % ( new_content.absolute_url(), )\n
else:\n
- preserved_parameters[\'portal_status_message\'] = N_("Template Does not Exist.")\n
+ preserved_parameters[\'portal_status_message\'] = Base_translateString("Template Does not Exist.")\n
redirect_url = \'%s/view\' % (context.absolute_url(), )\n
else:\n
redirect_url = request[\'ACTUAL_URL\']\n
- preserved_parameters[\'portal_status_message\'] = N_(\'Error: the action "%s" is not recognised.\' % (doAction0, ))\n
+ preserved_parameters[\'portal_status_message\'] = Base_translateString(\'Error: the action "%s" is not recognised.\' % (doAction0, ))\n
\n
return context.ERP5Site_redirect(redirect_url, keep_items=preserved_parameters, **kw)\n
</string> </value>
@@ -183,7 +183,7 @@
<string>_getattr_</string>
<string>context</string>
<string>portal</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>preserved_parameters</string>
<string>request</string>
<string>None</string>
@@ -228,6 +228,12 @@
<value> <string>Base_doAction</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_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Folder_create.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Folder_create.xml?rev=23255&r1=23254&r2=23255&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Folder_create.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Folder_create.xml Thu Aug 28 18:26:01 2008
@@ -65,16 +65,16 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>N_ = context.getPortalObject().Base_translateString\n
+ <value> <string>Base_translateString = context.getPortalObject().Base_translateString\n
allowed_type_list = context.getVisibleAllowedContentTypeList()\n
\n
if not allowed_type_list:\n
- return context.ERP5Site_redirect(\'%s/view\' % (context.absolute_url(), ), keep_items={\'portal_status_message\': N_("You are not allowed to add new content in this context.")})\n
+ return context.ERP5Site_redirect(\'%s/view\' % (context.absolute_url(), ), keep_items={\'portal_status_message\': Base_translateString("You are not allowed to add new content in this context.")})\n
\n
# newContent will add the first allowed type when we do not specify portal_type=\n
new_object = context.newContent(portal_type=allowed_type_list[0])\n
\n
-return context.ERP5Site_redirect(\'%s/view\' % (new_object.absolute_url(), ), keep_items={\'portal_status_message\': N_("Object Created.")})\n
+return context.ERP5Site_redirect(\'%s/view\' % (new_object.absolute_url(), ), keep_items={\'portal_status_message\': Base_translateString("Object Created.")})\n
</string> </value>
</item>
<item>
@@ -125,7 +125,7 @@
<tuple>
<string>_getattr_</string>
<string>context</string>
- <string>N_</string>
+ <string>Base_translateString</string>
<string>allowed_type_list</string>
<string>_getitem_</string>
<string>new_object</string>
@@ -148,6 +148,12 @@
<value> <string>Folder_create</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_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml?rev=23255&r1=23254&r2=23255&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml Thu Aug 28 18:26:01 2008
@@ -67,8 +67,7 @@
<key> <string>_body</string> </key>
<value> <string>from Products.Formulator.Errors import FormValidationError\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
-from Products.ERP5Type.Message import Message\n
-N_ = lambda msg, **kwd: Message(\'erp5_ui\', msg, **kwd)\n
+from Products.ERP5Type.Message import translateString\n
portal = context.getPortalObject()\n
request=context.REQUEST\n
\n
@@ -136,7 +135,7 @@
\'%s/%s\' % (context.absolute_url(), form_id),\n
keep_items={\'portal_status_message\': message}, **kw)\n
\n
-portal_status_message = request.get(\'portal_status_message\', N_(\'Status changed.\'))\n
+portal_status_message = request.get(\'portal_status_message\', translateString(\'Status changed.\'))\n
\n
return context.ERP5Site_redirect(\n
\'%s/%s\' % (context.absolute_url(), form_id),\n
@@ -197,8 +196,7 @@
<string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string>
- <string>Message</string>
- <string>N_</string>
+ <string>translateString</string>
<string>_getattr_</string>
<string>context</string>
<string>portal</string>
@@ -248,6 +246,12 @@
<value> <string>Workflow_statusModify</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
More information about the Erp5-report
mailing list