[Erp5-report] r23207 - /erp5/trunk/products/ERP5Form/

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Aug 28 10:39:10 2008
New Revision: 23207

URL: http://svn.erp5.org?rev=23207&view=rev
Log:
Use N_ function for translation message so that message will be found automatically.

Modified:
    erp5/trunk/products/ERP5Form/MultiRelationField.py
    erp5/trunk/products/ERP5Form/SelectionTool.py

Modified: erp5/trunk/products/ERP5Form/MultiRelationField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/MultiRelationField.py?rev=23207&r1=23206&r2=23207&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/MultiRelationField.py (original)
+++ erp5/trunk/products/ERP5Form/MultiRelationField.py Thu Aug 28 10:39:10 2008
@@ -41,6 +41,9 @@
 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
@@ -556,12 +559,10 @@
             # form is not validated
             ##############################
             portal_type = relation_uid[len(NEW_CONTENT_PREFIX):]
-            translated_portal_type = Message(domain='erp5_ui',
-                                             message=portal_type)
+            translated_portal_type = N_(portal_type)
             # XXX Replace New by Add
-            message = Message(
-                    domain='erp5_ui', message='New ${portal_type}',
-                    mapping={'portal_type': translated_portal_type})
+            message = N_('New ${portal_type}',
+                         mapping={'portal_type': translated_portal_type})
             display_text = message
           else:
             display_text = 'Object has been deleted'
@@ -653,11 +654,9 @@
                   # form is not validated
                   ##############################
                   portal_type = relation_uid[len(NEW_CONTENT_PREFIX):]
-                  translated_portal_type = Message(domain='erp5_ui',
-                                                   message=portal_type)
-                  message = Message(
-                          domain='erp5_ui', message='New ${portal_type}',
-                          mapping={'portal_type': translated_portal_type})
+                  translated_portal_type = N_(portal_type)
+                  message = N_('New ${portal_type}',
+                               mapping={'portal_type': translated_portal_type})
                   display_text = message
                 else:
                   display_text = 'Object has been deleted'
@@ -736,11 +735,9 @@
                       pass
                     else:
                       if portal_type in module.getVisibleAllowedContentTypeList():
-                        translated_portal_type = Message(domain='erp5_ui',
-                                                         message=portal_type)
-                        message = Message(
-                                domain='erp5_ui', message='Add ${portal_type}',
-                                mapping={'portal_type': translated_portal_type})
+                        translated_portal_type = N_(portal_type)
+                        message = N_('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=23207&r1=23206&r2=23207&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py Thu Aug 28 10:39:10 2008
@@ -45,6 +45,9 @@
 from Acquisition import aq_base
 from Products.ERP5Type.Message import Message
 import warnings
+
+# a marker function for translation.
+N_ = lambda msg, **kw: str(Message('erp5_ui', msg, **kw))
 
 _MARKER = []
 
@@ -1112,12 +1115,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 = Message(
-                          domain='erp5_ui',
-                          message="Please select one (or more) object.")
+          portal_status_message = N_("Please select one (or more) object.")
         else:
-          portal_status_message = Message(domain='erp5_ui',
-                                          message="Please select one object.")
+          portal_status_message = N_("Please select one object.")
 
 
         # Save the current REQUEST form