Changeset 7679 for main/waeup.sirp/trunk/src/waeup

Timestamp:

22 Feb 2012, 11:38:41 (13 years ago)

Author:

Henrik Bettermann

Message:

Translate student workflow history messages.

Location:

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

Files:

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

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

@@ -19 +19 @@
 from datetime import datetime
 from persistent.list import PersistentList
+from zope.component import getUtility
+from zope.i18n import translate
 from zope.annotation.interfaces import IAnnotations
-from waeup.sirp.interfaces import IObjectHistory, ISIRPObject
+from waeup.sirp.interfaces import IObjectHistory, ISIRPObject, ISIRPUtils
 from waeup.sirp.utils.helpers import get_current_principal
+
+from waeup.sirp.interfaces import MessageFactory as _
 
 class ObjectHistory(grok.Adapter):
@@ -64 +68 @@
         else:
             user = user.title
-        msg = '%s - %s by %s' % (timestamp, msg, user)
+        portal_language = getUtility(ISIRPUtils).PORTAL_LANGUAGE
+        by = 'by'
+        if portal_language != 'en':
+            by = translate(_('by'),'waeup.sirp',target_language=portal_language)
+        msg = '%s - %s %s %s' % (timestamp, msg, by, user)
         msgs.append(msg)
         self._annotations[self.history_key] = msgs

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
 from waeup.sirp.interfaces import (
-    IObjectHistory, ISIRPWorkflowInfo, 
+    IObjectHistory, ISIRPWorkflowInfo, ISIRPUtils,
     CREATED, ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
     REGISTERED, VALIDATED)
@@ -183 +184 @@
       Lock and unlock clearance form.
     """
-    msg = '%s' % event.transition.user_data['msg']
+
+    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)