[Erp5-report] r26076 - /erp5/trunk/products/ERP5Type/Accessor/WorkflowState.py

[nobody at svn.erp5.org]

Author: mame
Date: Tue Mar 17 15:11:02 2009
New Revision: 26076

URL: http://svn.erp5.org?rev=26076&view=rev
Log:
modified to translate workflow state titles with message id with and without context

Modified:
    erp5/trunk/products/ERP5Type/Accessor/WorkflowState.py

Modified: erp5/trunk/products/ERP5Type/Accessor/WorkflowState.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Accessor/WorkflowState.py?rev=26076&r1=26075&r2=26076&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Accessor/WorkflowState.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Accessor/WorkflowState.py [utf8] Tue Mar 17 15:11:02 2009
@@ -108,8 +108,16 @@
     def __call__(self, instance):
       portal_workflow = getToolByName(instance, 'portal_workflow')
       localizer = getToolByName(instance, 'Localizer')
-      wf = portal_workflow.getWorkflowById(self._key)
+      wf_id = self._key
+      wf = portal_workflow.getWorkflowById(wf_id)
+      selected_language = localizer.get_selected_language()
       state_title = wf._getWorkflowStateOf(instance).title
-      return localizer.erp5_ui.gettext(state_title).encode('utf8')
+      msg_id = '%s [state in %s]' % (state_title, wf_id)
+      result = localizer.erp5_ui.gettext(msg_id,
+             lang=selected_language,default='')      
+      if result == '':
+        result = localizer.erp5_ui.gettext(state_title,
+                              lang=selected_language)
+      return result
 
     psyco.bind(__call__)