Changeset 7959

Timestamp:

22 Mar 2012, 15:51:23 (13 years ago)

Author:

Henrik Bettermann

Message:

Translate all history messages.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• objecthistory.py (modified) (1 diff)
• students/batching.py (modified) (3 diffs)

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

@@ -69 +69 @@
             user = user.title
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        by = 'by'
-        if portal_language != 'en':
-            by = translate(_('by'),'waeup.kofa',target_language=portal_language)
-            msg = translate(msg,'waeup.kofa',target_language=portal_language)
+        by = translate(_('by'),'waeup.kofa',target_language=portal_language)
+        msg = translate(msg,'waeup.kofa',target_language=portal_language)
         msg = u'%s - %s %s %s' % (timestamp, msg, by, user)
         msgs.append(msg)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -35 +35 @@
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
     IObjectHistory, VALIDATED)
+from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.interfaces import (
     IStudent, IStudentStudyCourse,
@@ -130 +131 @@
         return None
 
-        
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
         parent.addStudent(obj)
-        # We don't need to log this because is already done by the workflow
-        # transition even handler.
+        # We have to log this if reg_state is provided. If not,
+        # logging is done by the event handler handle_student_added
+        if row.has_key('reg_state'):
+            parent.logger.info('%s - Student record created' % obj.student_id)
         history = IObjectHistory(obj)
-        history.addMessage('Student record imported')
+        history.addMessage(_('Student record created'))
         return
 
@@ -161 +163 @@
             elif key == 'reg_state':
                 IWorkflowState(obj).setState(value)
-                msg = "State '%s' set" % value
+                msg = _("State '${a}' set", mapping = {'a':value})
                 history = IObjectHistory(obj)
                 history.addMessage(msg)