Changeset 7690 for main

Timestamp:

23 Feb 2012, 15:41:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Do not translate message in event handler bit in addMessage.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/workflow.py (modified) (2 diffs)
• objecthistory.py (modified) (1 diff)
• students/workflow.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py

@@ -19 +19 @@
 """
 import grok
-from zope.component import getUtility
-from zope.i18n import translate
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
@@ -165 +163 @@
     """
     msg = event.transition.user_data['msg']
-    portal_language = getUtility(ISIRPUtils).PORTAL_LANGUAGE
-    if portal_language != 'en':
-        msg = translate(msg,'waeup.sirp',target_language=portal_language)
     history = IObjectHistory(obj)
     history.addMessage(msg)

main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py

@@ -72 +72 @@
         if portal_language != 'en':
             by = translate(_('by'),'waeup.sirp',target_language=portal_language)
+            msg = translate(msg,'waeup.sirp',target_language=portal_language)
         msg = u'%s - %s %s %s' % (timestamp, msg, by, user)
         msgs.append(msg)

main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

@@ -3 +3 @@
 import grok
 from zope.component import getUtility
-from zope.i18n import translate
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
@@ -186 +185 @@
 
     msg = event.transition.user_data['msg']
-    portal_language = getUtility(ISIRPUtils).PORTAL_LANGUAGE
-    if portal_language != 'en':
-        msg = translate(msg,'waeup.sirp',target_language=portal_language)
     history = IObjectHistory(obj)
     history.addMessage(msg)