[Erp5-report] r23233 - in /erp5/trunk/products/ERP5Form: ./ Extensions/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 15:33:44 CEST 2008
Author: yusei
Date: Thu Aug 28 15:33:35 2008
New Revision: 23233
URL: http://svn.erp5.org?rev=23233&view=rev
Log:
Use translateString instead of N_.
Modified:
erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py
erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py
erp5/trunk/products/ERP5Form/MatrixBox.py
erp5/trunk/products/ERP5Form/MultiRelationField.py
erp5/trunk/products/ERP5Form/SelectionTool.py
Modified: erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py?rev=23233&r1=23232&r2=23233&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py (original)
+++ erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py Thu Aug 28 15:33:35 2008
@@ -47,7 +47,7 @@
request = self.REQUEST
portal = self.getPortalObject()
- N_ = portal.Base_translateString
+ Base_translateString = portal.Base_translateString
wf_tool = portal.portal_workflow
selection_tool = portal.portal_selections
@@ -85,7 +85,7 @@
document_list.append(doc.asContext(
uid='new_%s' % counter,
getListItemUrl=UrlGetter(doc, state_var),
- workflow_title=N_(workflow.title_or_id()),
+ workflow_title=Base_translateString(workflow.title_or_id()),
translated_workflow_state_title=
translated_workflow_state_title,
count=brain.count,
@@ -125,7 +125,7 @@
document_list.append(doc.asContext(
uid='new_%s' % counter,
getListItemUrl=UrlGetter(doc, state_var),
- workflow_title=N_(workflow.title_or_id()),
+ workflow_title=Base_translateString(workflow.title_or_id()),
translated_workflow_state_title=
translated_workflow_state_title,
count=document_count,
Modified: erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py?rev=23233&r1=23232&r2=23233&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py (original)
+++ erp5/trunk/products/ERP5Form/Extensions/Folder_viewSearchDialog.py Thu Aug 28 15:33:35 2008
@@ -31,7 +31,7 @@
from Products.CMFCore.utils import _getViewFor
from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type.Message import Message
+from Products.ERP5Type.Message import translateString
from Products.ERP5Form.Form import ERP5Form
from Products.ERP5Form.ListBox import ListBoxListRenderer
@@ -44,7 +44,6 @@
category_tool = getToolByName(portal, 'portal_categories')
types_tool = getToolByName(portal, 'portal_types')
workflow_tool = getToolByName(portal, 'portal_workflow')
- N_ = lambda msg, **kw: str(Message('erp5_ui', msg, **kw))
default_view = _getViewFor(self)
listbox = default_view.listbox
@@ -101,13 +100,16 @@
field.manage_edit_xmlrpc(dict(
form_id='Base_viewDialogFieldLibrary',
field_id='your_category'))
- field._surcharged_edit(dict(title=N_('${key} ${usage}', mapping=dict(key=N_(column_title), usage=N_('Usage'))),
- items=[(N_('Equals To'), ''),
- (N_('Greater Than'), 'min'),
- (N_('Lower Than'),'max'),
- (N_('Not Greater Then'), 'ngt'),
- (N_('Not Lower Than'), 'nlt'),
- ]),
+ field._surcharged_edit(dict(
+ title=translateString('${key} ${usage}',
+ mapping=dict(key=translateString(column_title),
+ usage=translateString('Usage'))),
+ items=[(translateString('Equals To'), ''),
+ (translateString('Greater Than'), 'min'),
+ (translateString('Lower Than'),'max'),
+ (translateString('Not Greater Then'), 'ngt'),
+ (translateString('Not Lower Than'), 'nlt'),
+ ]),
['title', 'items'])
field._surcharged_tales(
@@ -136,12 +138,12 @@
field.manage_edit_xmlrpc(dict(
form_id='Base_viewDialogFieldLibrary',
field_id='your_category'))
- field._surcharged_edit(dict(title=N_('${key} ${usage}', mapping=dict(key=N_(column_title), usage=N_('Usage'))),
- items=[(N_('Equals To'), ''),
- (N_('Greater Than'), 'min'),
- (N_('Lower Than'),'max'),
- (N_('Not Greater Then'), 'ngt'),
- (N_('Not Lower Than'), 'nlt'),
+ field._surcharged_edit(dict(title=translateString('${key} ${usage}', mapping=dict(key=translateString(column_title), usage=translateString('Usage'))),
+ items=[(translateString('Equals To'), ''),
+ (translateString('Greater Than'), 'min'),
+ (translateString('Lower Than'),'max'),
+ (translateString('Not Greater Then'), 'ngt'),
+ (translateString('Not Lower Than'), 'nlt'),
]),
['title', 'items'])
@@ -184,13 +186,13 @@
field.manage_edit_xmlrpc(dict(
form_id='Base_viewDialogFieldLibrary',
field_id='your_category'))
- field._surcharged_edit(dict(title=N_('${key} ${usage}', mapping=dict(key=N_(column_title), usage=N_('Search Key'))),
+ field._surcharged_edit(dict(title=translateString('${key} ${usage}', mapping=dict(key=translateString(column_title), usage=translateString('Search Key'))),
description='',
- items=[(N_('Default (${search_key})',
+ items=[(translateString('Default (${search_key})',
mapping=dict(search_key=
- N_(default_search_key))), ''),
- (N_('ExactMatch'), 'ExactMatch' ),
- (N_('Keyword'), 'Keyword'),
+ translateString(default_search_key))), ''),
+ (translateString('ExactMatch'), 'ExactMatch' ),
+ (translateString('Keyword'), 'Keyword'),
]),
['title', 'items'])
@@ -286,11 +288,11 @@
field.manage_edit_xmlrpc(dict(
form_id='Base_viewDialogFieldLibrary',
field_id='your_category_list'))
- items = [('', '')] + sorted([(N_(x.title), x.id) for x
+ items = [('', '')] + sorted([(translateString(x.title), x.id) for x
in workflow.states.objectValues()],
lambda a, b: cmp(a[0], b[0]))
field._surcharged_edit(
- dict(title=N_(workflow.title),
+ dict(title=translateString(workflow.title),
items=items,
size=len(items)),
['title', 'items', 'size'])
@@ -311,8 +313,8 @@
form_id='Base_viewDialogFieldLibrary',
field_id='your_category_list'))
field._surcharged_edit(
- dict(title=N_('Type'),
- items=[(N_(x), x) for x in allowed_content_types]),
+ dict(title=translateString('Type'),
+ items=[(translateString(x), x) for x in allowed_content_types]),
['title', 'items'])
field._surcharged_tales(
Modified: erp5/trunk/products/ERP5Form/MatrixBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/MatrixBox.py?rev=23233&r1=23232&r2=23233&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/MatrixBox.py (original)
+++ erp5/trunk/products/ERP5Form/MatrixBox.py Thu Aug 28 15:33:35 2008
@@ -32,10 +32,8 @@
from Products.Formulator import Widget, Validator
from Products.Formulator.Errors import FormValidationError, ValidationError
from Products.Formulator.Field import ZMIField
-from Products.ERP5Type.Message import Message
-
-def N_(message, **kw):
- return Message('erp5_ui', message, **kw)
+from Products.ERP5Type.Message import translateString
+
class MatrixBoxWidget(Widget.Widget):
"""
@@ -322,7 +320,7 @@
my_field.render(value=display_value,
REQUEST=REQUEST,
key=key),
- N_(field_errors[key].error_text))
+ translateString(field_errors[key].error_text))
else:
cell_body += '<span class="input">%s</span>' %\
my_field.render(
Modified: erp5/trunk/products/ERP5Form/MultiRelationField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/MultiRelationField.py?rev=23233&r1=23232&r2=23233&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/MultiRelationField.py (original)
+++ erp5/trunk/products/ERP5Form/MultiRelationField.py Thu Aug 28 15:33:35 2008
@@ -33,7 +33,7 @@
from Products.ERP5Type.Utils import convertToUpperCase
from Products.CMFCore.utils import getToolByName
from Products.PythonScripts.Utility import allow_class
-from Products.ERP5Type.Message import Message
+from Products.ERP5Type.Message import translateString
from AccessControl import ClassSecurityInfo
from types import StringType
from zLOG import LOG
@@ -41,9 +41,6 @@
from Globals import get_request
from AccessControl import Unauthorized
from AccessControl import getSecurityManager
-
-# a marker function for translation.
-N_ = lambda msg, **kw: str(Message('erp5_ui', msg, **kw))
# Max. number of catalog result
MAX_SELECT = 30
@@ -559,10 +556,10 @@
# form is not validated
##############################
portal_type = relation_uid[len(NEW_CONTENT_PREFIX):]
- translated_portal_type = N_(portal_type)
+ translated_portal_type = translateString(portal_type)
# XXX Replace New by Add
- message = N_('New ${portal_type}',
- mapping={'portal_type': translated_portal_type})
+ message = translateString('New ${portal_type}',
+ mapping={'portal_type':translated_portal_type})
display_text = message
else:
display_text = 'Object has been deleted'
@@ -654,9 +651,9 @@
# form is not validated
##############################
portal_type = relation_uid[len(NEW_CONTENT_PREFIX):]
- translated_portal_type = N_(portal_type)
- message = N_('New ${portal_type}',
- mapping={'portal_type': translated_portal_type})
+ translated_portal_type = translateString(portal_type)
+ message = translateString('New ${portal_type}',
+ mapping={'portal_type':translated_portal_type})
display_text = message
else:
display_text = 'Object has been deleted'
@@ -735,9 +732,9 @@
pass
else:
if portal_type in module.getVisibleAllowedContentTypeList():
- translated_portal_type = N_(portal_type)
- message = N_('Add ${portal_type}',
- mapping={'portal_type':translated_portal_type})
+ translated_portal_type = translateString(portal_type)
+ message = translateString('Add ${portal_type}',
+ mapping={'portal_type':translated_portal_type})
menu_item_list.append((message,
'%s%s' % (NEW_CONTENT_PREFIX,
portal_type)))
Modified: erp5/trunk/products/ERP5Form/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/SelectionTool.py?rev=23233&r1=23232&r2=23233&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py Thu Aug 28 15:33:35 2008
@@ -43,11 +43,9 @@
import string
from zLOG import LOG, INFO
from Acquisition import aq_base
-from Products.ERP5Type.Message import Message
+from Products.ERP5Type.Message import translateString
import warnings
-# a marker function for translation.
-N_ = lambda msg, **kw: str(Message('erp5_ui', msg, **kw))
_MARKER = []
@@ -1115,9 +1113,9 @@
if len(field_value) > 1 and isinstance(field_value, type([])):
field_value = ' OR '.join(field_value)
REQUEST.form[field_key] = field_value
- portal_status_message = N_("Please select one (or more) object.")
+ portal_status_message = translateString("Please select one (or more) object.")
else:
- portal_status_message = N_("Please select one object.")
+ portal_status_message = translateString("Please select one object.")
# Save the current REQUEST form
More information about the Erp5-report
mailing list