Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/viewlets.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/viewlets.py	(revision 7692)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/viewlets.py	(revision 7693)
@@ -31,5 +31,5 @@
     )
 
-_ = zope.i18nmessageid.MessageFactory('waeup.sirp')
+from waeup.sirp.interfaces import MessageFactory as _
 
 grok.context(ISIRPObject) # Make ISIRPObject the default context
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py	(revision 7692)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py	(revision 7693)
@@ -35,5 +35,5 @@
 from waeup.sirp.utils.helpers import get_user_account
 
-_ = zope.i18nmessageid.MessageFactory('waeup.sirp')
+from waeup.sirp.interfaces import MessageFactory as _
 
 grok.templatedir('templates')
Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py	(revision 7692)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py	(revision 7693)
@@ -37,5 +37,5 @@
     IHostelsContainer, IHostel, IBed, IBedAllocateStudent)
 
-_ = zope.i18nmessageid.MessageFactory('waeup.sirp')
+from waeup.sirp.interfaces import MessageFactory as _
 
 def write_log_message(view, message):
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7692)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7693)
@@ -45,5 +45,5 @@
     )
 
-_ = zope.i18nmessageid.MessageFactory('waeup.sirp')
+from waeup.sirp.interfaces import MessageFactory as _
 
 grok.context(ISIRPObject) # Make ISIRPObject the default context
