Changeset 8194 for main/waeup.kofa/trunk

Timestamp:

17 Apr 2012, 11:40:06 (13 years ago)

Author:

Henrik Bettermann

Message:

Store utc without tzinfo in persistent datetime objects. Localisation will be done in views only.

Location:

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

Files:

• accesscodes/accesscode.py (modified) (2 diffs)
• accesscodes/browser.py (modified) (1 diff)
• accesscodes/tests/test_accesscode.py (modified) (1 diff)
• applicants/browser.py (modified) (2 diffs)
• locales/yo/LC_MESSAGES/waeup.kofa.po (modified) (63 diffs)
• payments/payment.py (modified) (1 diff)
• students/accommodation.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_student.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/accesscode.py

@@ -356 +356 @@
         if batch_name in self.keys():
             raise KeyError('Batch already exists: %s' % batch_name)
-        tz = getUtility(IKofaUtils).tzinfo
         batch = AccessCodeBatch(
-            datetime.now(tz), creator, prefix, cost, 0, num=num)
+            datetime.utcnow(), creator, prefix, cost, 0, num=num)
         num_entries = 0
         self[batch_name] = batch
@@ -430 +429 @@
         creator = 'system'
         entry_num = 0
-        tz = getUtility(IKofaUtils).tzinfo
-        creation_date = datetime.now(tz)
+        creation_date = datetime.utcnow()
         basecontainer.createBatch(creation_date, creator,
             'SFE', cost, entry_num)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser.py

@@ -85 +85 @@
     def createBatch(self, **data):
         creator = self.request.principal.id
-        tz = getUtility(IKofaUtils).tzinfo
-        creation_date = datetime.now(tz)
+        creation_date = datetime.utcnow()
         data.update(creation_date=creation_date, creator=creator)
         batch = self.context.createBatch(**data)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_accesscode.py

@@ -259 +259 @@
         self.app = self.getRootFolder()['app']
 
-        tz = getUtility(IKofaUtils).tzinfo
         batch = AccessCodeBatch(    # create batch with zero entries
-            datetime.now(tz), 'testuser', 'FOO', 9.99, 0)
+            datetime.utcnow(), 'testuser', 'FOO', 9.99, 0)
         self.app['accesscodes'].addBatch(batch)
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -521 +521 @@
         self.context.r_code = u'00'
         self.context.p_state = 'paid'
-        tz = getUtility(IKofaUtils).tzinfo
-        self.context.payment_date = datetime.now(tz)
+        self.context.payment_date = datetime.utcnow()
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         self.context.__parent__.loggerInfo(
@@ -828 +827 @@
             return
         IWorkflowInfo(self.context).fireTransition('submit')
-        tz = getUtility(IKofaUtils).tzinfo
-        self.context.application_date = now(tz)
+        self.context.application_date = datetime.utcnow()
         self.context.locked = True
         self.flash(_('Form has been submitted.'))

main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po

@@ -15 +15 @@
 msgstr ""
 "Project-Id-Version: WAeUP.Kofa\n"
-"POT-Creation-Date: Mon Mar 26 11:33:10 2012\n"
+"POT-Creation-Date: Thu Apr 12 09:07:38 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -29 +29 @@
 
 #: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:129
-#: waeup/kofa/applicants/browser.py:181 waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:336
-#: waeup/kofa/browser/pages.py:507 waeup/kofa/browser/pages.py:712
-#: waeup/kofa/browser/pages.py:739 waeup/kofa/browser/pages.py:762
-#: waeup/kofa/browser/pages.py:809 waeup/kofa/browser/pages.py:839
-#: waeup/kofa/browser/pages.py:959 waeup/kofa/browser/pages.py:1187
-#: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1345
-#: waeup/kofa/browser/pages.py:1372 waeup/kofa/browser/pages.py:1400
-#: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1447
-#: waeup/kofa/browser/pages.py:1488 waeup/kofa/browser/pages.py:1567
-#: waeup/kofa/browser/pages.py:1568 waeup/kofa/browser/pages.py:1570
-#: waeup/kofa/browser/pages.py:1648 waeup/kofa/browser/pages.py:1693
-#: waeup/kofa/browser/pages.py:1731 waeup/kofa/browser/pages.py:1775
-#: waeup/kofa/browser/pages.py:1814 waeup/kofa/browser/pages.py:1816
-#: waeup/kofa/browser/pages.py:1851 waeup/kofa/browser/pages.py:1902
-#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:753 waeup/kofa/students/browser.py:893
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:132
+#: waeup/kofa/applicants/browser.py:183 waeup/kofa/applicants/browser.py:254
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/browser/pages.py:510 waeup/kofa/browser/pages.py:716
+#: waeup/kofa/browser/pages.py:743 waeup/kofa/browser/pages.py:766
+#: waeup/kofa/browser/pages.py:813 waeup/kofa/browser/pages.py:843
+#: waeup/kofa/browser/pages.py:963 waeup/kofa/browser/pages.py:1191
+#: waeup/kofa/browser/pages.py:1328 waeup/kofa/browser/pages.py:1349
+#: waeup/kofa/browser/pages.py:1376 waeup/kofa/browser/pages.py:1404
+#: waeup/kofa/browser/pages.py:1405 waeup/kofa/browser/pages.py:1451
+#: waeup/kofa/browser/pages.py:1492 waeup/kofa/browser/pages.py:1571
+#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1574
+#: waeup/kofa/browser/pages.py:1652 waeup/kofa/browser/pages.py:1697
+#: waeup/kofa/browser/pages.py:1735 waeup/kofa/browser/pages.py:1779
+#: waeup/kofa/browser/pages.py:1818 waeup/kofa/browser/pages.py:1820
+#: waeup/kofa/browser/pages.py:1855 waeup/kofa/browser/pages.py:1906
+#: waeup/kofa/browser/pages.py:1958 waeup/kofa/students/browser.py:627
+#: waeup/kofa/students/browser.py:628 waeup/kofa/students/browser.py:795
+#: waeup/kofa/students/browser.py:797 waeup/kofa/students/browser.py:937
 msgid "Cancel"
 msgstr ""
@@ -85 +85 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:596
-#: waeup/kofa/browser/pages.py:1146 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:600
+#: waeup/kofa/browser/pages.py:1150 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr ""
@@ -342 +342 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:116 waeup/kofa/applicants/browser.py:323
-#: waeup/kofa/applicants/browser.py:744
+#: waeup/kofa/applicants/browser.py:119 waeup/kofa/applicants/browser.py:325
+#: waeup/kofa/applicants/browser.py:724
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:119 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:747 waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:647
-#: waeup/kofa/students/browser.py:801 waeup/kofa/students/browser.py:979
-#: waeup/kofa/students/browser.py:1189 waeup/kofa/students/browser.py:1776
+#: waeup/kofa/applicants/browser.py:122 waeup/kofa/applicants/browser.py:328
+#: waeup/kofa/applicants/browser.py:727 waeup/kofa/browser/pages.py:137
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:845 waeup/kofa/students/browser.py:1023
+#: waeup/kofa/students/browser.py:1238 waeup/kofa/students/browser.py:1832
 msgid "Successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:168
+#: waeup/kofa/applicants/browser.py:171
 msgid ""
 "An applicants container for the same application type and entrance year "
@@ -362 +362 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:177
+#: waeup/kofa/applicants/browser.py:179
 msgid "Added:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:189 waeup/kofa/applicants/export.py:78
+#: waeup/kofa/applicants/browser.py:191 waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -373 +373 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:299
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:687
-#: waeup/kofa/applicants/browser.py:790 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:837 waeup/kofa/browser/pages.py:480
-#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:732 waeup/kofa/browser/pages.py:1185
-#: waeup/kofa/browser/pages.py:1400 waeup/kofa/browser/pages.py:1441
-#: waeup/kofa/browser/pages.py:1567 waeup/kofa/browser/pages.py:1620
-#: waeup/kofa/browser/pages.py:1763 waeup/kofa/browser/pages.py:1814
-#: waeup/kofa/browser/pages.py:1835 waeup/kofa/hostels/browser.py:209
+#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
+#: waeup/kofa/applicants/browser.py:629 waeup/kofa/applicants/browser.py:667
+#: waeup/kofa/applicants/browser.py:771 waeup/kofa/applicants/browser.py:774
+#: waeup/kofa/applicants/browser.py:818 waeup/kofa/browser/pages.py:483
+#: waeup/kofa/browser/pages.py:639 waeup/kofa/browser/pages.py:662
+#: waeup/kofa/browser/pages.py:736 waeup/kofa/browser/pages.py:1189
+#: waeup/kofa/browser/pages.py:1404 waeup/kofa/browser/pages.py:1445
+#: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1624
+#: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1818
+#: waeup/kofa/browser/pages.py:1839 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:463
-#: waeup/kofa/students/browser.py:540 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:605 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:1450
-#: waeup/kofa/students/browser.py:1465 waeup/kofa/students/browser.py:1580
+#: waeup/kofa/students/browser.py:370 waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:578 waeup/kofa/students/browser.py:627
+#: waeup/kofa/students/browser.py:643 waeup/kofa/students/browser.py:795
+#: waeup/kofa/students/browser.py:820 waeup/kofa/students/browser.py:1499
+#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1636
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:331
-#: waeup/kofa/applicants/browser.py:360
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:263 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:303 waeup/kofa/applicants/browser.py:716
-#: waeup/kofa/browser/pages.py:1444 waeup/kofa/browser/pages.py:1766
-#: waeup/kofa/browser/pages.py:1838 waeup/kofa/browser/pages.py:1950
-#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
-#: waeup/kofa/students/browser.py:384
+#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:696
+#: waeup/kofa/browser/pages.py:1448 waeup/kofa/browser/pages.py:1770
+#: waeup/kofa/browser/pages.py:1842 waeup/kofa/browser/pages.py:1954
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:396
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:312
+#: waeup/kofa/applicants/browser.py:314
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:363
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:368
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:381
+#: waeup/kofa/applicants/browser.py:385
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:283
+#: waeup/kofa/applicants/browser.py:404 waeup/kofa/students/browser.py:295
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:284
+#: waeup/kofa/applicants/browser.py:405 waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:402
-msgid "${a} Application Record ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:453
+#: waeup/kofa/applicants/browser.py:410
+msgid "${a} <br /> Application Record ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:461
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:460 waeup/kofa/students/browser.py:1028
+#: waeup/kofa/applicants/browser.py:468 waeup/kofa/students/browser.py:1078
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:473 waeup/kofa/students/browser.py:1042
+#: waeup/kofa/applicants/browser.py:481 waeup/kofa/students/browser.py:1092
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:500 waeup/kofa/students/browser.py:1061
+#: waeup/kofa/applicants/browser.py:508 waeup/kofa/students/browser.py:1111
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:528 waeup/kofa/students/browser.py:1110
+#: waeup/kofa/applicants/browser.py:535 waeup/kofa/students/browser.py:1159
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:549
+#: waeup/kofa/applicants/browser.py:556
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:555
+#: waeup/kofa/applicants/browser.py:562
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:561
+#: waeup/kofa/applicants/browser.py:568
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:626
+#: waeup/kofa/applicants/browser.py:602
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:63
+#: waeup/kofa/applicants/browser.py:607
+msgid "jpg file extension expected."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:629 waeup/kofa/applicants/browser.py:774
+#: waeup/kofa/applicants/browser.py:826
+msgid "Final Submit"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:630 waeup/kofa/applicants/browser.py:737
+#: waeup/kofa/applicants/browser.py:772 waeup/kofa/applicants/browser.py:807
+#: waeup/kofa/students/browser.py:1029
+msgid "Add online payment ticket"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:630 waeup/kofa/applicants/browser.py:742
+#: waeup/kofa/applicants/browser.py:772 waeup/kofa/applicants/browser.py:775
+#: waeup/kofa/applicants/browser.py:812 waeup/kofa/students/browser.py:797
+#: waeup/kofa/students/browser.py:829 waeup/kofa/students/browser.py:1005
+#: waeup/kofa/students/browser.py:1814
+msgid "Remove selected tickets"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:653
+msgid "${a} <br /> Application Form ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:66
 msgid "Application Section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:631
-msgid "jpg file extension expected."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:845
-msgid "Final Submit"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:757
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:826
-#: waeup/kofa/students/browser.py:985
-msgid "Add online payment ticket"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:762
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:831 waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:961
-#: waeup/kofa/students/browser.py:1758
-msgid "Remove selected tickets"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:673
-msgid "${a} Application Form ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:684 waeup/kofa/students/browser.py:355
+#: waeup/kofa/applicants/browser.py:664 waeup/kofa/students/browser.py:367
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:731 waeup/kofa/students/browser.py:967
+#: waeup/kofa/applicants/browser.py:711 waeup/kofa/students/browser.py:1011
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:75 waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:104
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:306
-#: waeup/kofa/browser/pages.py:638 waeup/kofa/browser/pages.py:679
-#: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1335
-#: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1436
-#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/browser.py:1156 waeup/kofa/students/browser.py:1169
+#: waeup/kofa/applicants/browser.py:785 waeup/kofa/students/browser.py:92
+msgid "The requested form is locked (read-only)."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:799
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:801
+msgid "Passport picture confirmation box not ticked."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:107
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/browser/pages.py:642 waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:1328 waeup/kofa/browser/pages.py:1339
+#: waeup/kofa/browser/pages.py:1405 waeup/kofa/browser/pages.py:1440
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:210
+#: waeup/kofa/students/browser.py:1205 waeup/kofa/students/browser.py:1218
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:124
-#: waeup/kofa/applicants/browser.py:147 waeup/kofa/applicants/browser.py:159
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:127
+#: waeup/kofa/applicants/browser.py:150 waeup/kofa/applicants/browser.py:162
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:138
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:345
-#: waeup/kofa/browser/pages.py:1402 waeup/kofa/browser/pages.py:1461
-#: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1657
-#: waeup/kofa/browser/pages.py:1817 waeup/kofa/browser/pages.py:1874
+#: waeup/kofa/applicants/browser.py:83 waeup/kofa/applicants/browser.py:141
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/browser/pages.py:1406 waeup/kofa/browser/pages.py:1465
+#: waeup/kofa/browser/pages.py:1575 waeup/kofa/browser/pages.py:1661
+#: waeup/kofa/browser/pages.py:1821 waeup/kofa/browser/pages.py:1878
 msgid "Remove selected local roles"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:804 waeup/kofa/students/browser.py:90
-msgid "The requested form is locked (read-only)."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:134
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:341
-#: waeup/kofa/browser/pages.py:1403 waeup/kofa/browser/pages.py:1457
-#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1653
-#: waeup/kofa/browser/pages.py:1818 waeup/kofa/browser/pages.py:1870
+#: waeup/kofa/applicants/browser.py:838 waeup/kofa/students/browser.py:1681
+msgid "This form cannot be submitted. Wrong state!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:84 waeup/kofa/applicants/browser.py:137
+#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/browser/pages.py:1407 waeup/kofa/browser/pages.py:1461
+#: waeup/kofa/browser/pages.py:1576 waeup/kofa/browser/pages.py:1657
+#: waeup/kofa/browser/pages.py:1822 waeup/kofa/browser/pages.py:1874
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:818
-msgid "No passport picture uploaded."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:843
+msgid "Form has been submitted."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:85
 msgid "Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
-msgid "Passport picture confirmation box not ticked."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:857 waeup/kofa/students/browser.py:1625
-msgid "This form cannot be submitted. Wrong state!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:862
-msgid "Form has been submitted."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:897
-msgid "Register for ${a} Application"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:903
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:887
+msgid "Apply for ${a}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:893
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:908
+#: waeup/kofa/applicants/browser.py:898
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:917
+#: waeup/kofa/applicants/browser.py:907
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:932
+#: waeup/kofa/applicants/browser.py:930
+msgid "An error occurred."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:936 waeup/kofa/applicants/browser.py:947
+msgid "No application record found."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:939
+msgid "Your password has already been set. Please proceed to the login page."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:957
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:964
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:948
+#: waeup/kofa/applicants/browser.py:973
 msgid "Your registration was successful."
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:18
-msgid "Photograph"
-msgstr ""
-
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:17
+msgid "Admitted Course of Study:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
+msgid "Photograph:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:44
 msgid "Application Transition:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:60
 msgid ""
 "I confirm that the Passport Photograph uploaded on this form is a true "
@@ -617 +633 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:74
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:76
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
 msgid "Acceptance Fee Payment Tickets"
 msgstr ""
@@ -640 +656 @@
 msgstr ""
 
+#: waeup/kofa/applicants/browser_templates/applicantregister.pt:22
+msgid ""
+"Your application record will be looked up and an email with your login "
+"credentials will be sent to the address provided."
+msgstr ""
+
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:8
 msgid "Please solve the captcha<br />to prevent misuse of this service:"
@@ -665 +687 @@
 msgstr ""
 
-#: waeup/kofa/applicants/container.py:52
-msgid "Basic"
-msgstr ""
-
-#: waeup/kofa/applicants/container.py:55
-msgid "handles basic applicants"
-msgstr ""
-
 #: waeup/kofa/applicants/export.py:40
 msgid "Basic Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:718
+#: waeup/kofa/applicants/interfaces.py:138
+msgid "Create Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:139
+msgid "Update Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:159 waeup/kofa/students/browser.py:762
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -701 +723 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:719
+#: waeup/kofa/applicants/interfaces.py:165 waeup/kofa/students/browser.py:763
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -720 +742 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:212
-#: waeup/kofa/applicants/interfaces.py:322
+#: waeup/kofa/applicants/interfaces.py:171
+#: waeup/kofa/applicants/interfaces.py:273
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:220
+#: waeup/kofa/applicants/interfaces.py:178
+#: waeup/kofa/applicants/interfaces.py:280
+msgid "Year of Entrance"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:185
+msgid "Application Mode"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:191
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:227
-#: waeup/kofa/applicants/interfaces.py:330
-msgid "Year of Entrance"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:235
-#: waeup/kofa/applicants/interfaces.py:338
-msgid "Applicants Container Type"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:251
+#: waeup/kofa/applicants/interfaces.py:205
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:258
+#: waeup/kofa/applicants/interfaces.py:211
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:271
+#: waeup/kofa/applicants/interfaces.py:224
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:277
+#: waeup/kofa/applicants/interfaces.py:229
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:283
+#: waeup/kofa/applicants/interfaces.py:234
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:366
+#: waeup/kofa/applicants/interfaces.py:313
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:371
-msgid "JAMB Registration Number"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:383
+#: waeup/kofa/applicants/interfaces.py:318
+#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:269
+#: waeup/kofa/students/interfaces.py:508
+msgid "Registration Number"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:329
+#: waeup/kofa/applicants/interfaces.py:495
 #: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:387
+#: waeup/kofa/applicants/interfaces.py:333
 #: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:391
+#: waeup/kofa/applicants/interfaces.py:337
 #: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:395
+#: waeup/kofa/applicants/interfaces.py:341
 #: waeup/kofa/students/interfaces.py:218
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:400
-msgid "State/LGA"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:405
+#: waeup/kofa/applicants/interfaces.py:345
 #: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:411 waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418 waeup/kofa/students/interfaces.py:504
+#: waeup/kofa/applicants/interfaces.py:350
+#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:500 waeup/kofa/interfaces.py:392
+#: waeup/kofa/interfaces.py:418 waeup/kofa/students/interfaces.py:514
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:416 waeup/kofa/interfaces.py:397
+#: waeup/kofa/applicants/interfaces.py:355 waeup/kofa/interfaces.py:397
 #: waeup/kofa/interfaces.py:425 waeup/kofa/students/interfaces.py:208
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:421
-#: waeup/kofa/applicants/interfaces.py:507
+#: waeup/kofa/applicants/interfaces.py:360
+#: waeup/kofa/applicants/interfaces.py:438
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:426
-#: waeup/kofa/applicants/interfaces.py:512
+#: waeup/kofa/applicants/interfaces.py:365
+#: waeup/kofa/applicants/interfaces.py:443
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:431
-msgid "School Grades"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:441
-#: waeup/kofa/applicants/interfaces.py:517
+#: waeup/kofa/applicants/interfaces.py:377
+#: waeup/kofa/applicants/interfaces.py:464
+msgid "Notice"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:453
+msgid "Screening Venue"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:448
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:445
-#: waeup/kofa/applicants/interfaces.py:522
-msgid "Screening Venue"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:449
-#: waeup/kofa/applicants/interfaces.py:527
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:458
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:455
-#: waeup/kofa/applicants/interfaces.py:534
-msgid "Notice"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:477
+#: waeup/kofa/applicants/interfaces.py:394
 #: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
@@ -848 +866 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:482
+#: waeup/kofa/applicants/interfaces.py:399
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:561
-#: waeup/kofa/students/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:510
+#: waeup/kofa/students/interfaces.py:494
 msgid "Payment Session"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:110
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
-msgid "Department:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:121
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
-msgid "Faculty:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:186
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
-msgid "Admitted Course of Study:"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/pdf.py:204
+#: waeup/kofa/applicants/pdf.py:50
+msgid "Application Record"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/pdf.py:84
 msgid ""
-"<font size=10>Proceed to the login page of the portal and enter your new "
-"credentials: user name= ${a}, password = ${b}.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:210
-msgid "<font size=10>Change your password when you have  logged in.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:57
-msgid "Application Record"
+"Proceed to the login page of the portal and enter your new credentials: user "
+"name= ${a}, password = ${b}."
+msgstr ""
+
+#: waeup/kofa/applicants/pdf.py:91
+msgid "Change your password when you have logged in."
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:35
+msgid "Desired Study Courses"
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:36
+msgid "Process Data"
 msgstr ""
 
@@ -910 +919 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:256
+#: waeup/kofa/students/browser.py:268
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:321
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:336
 msgid "Request callback"
 msgstr ""
@@ -926 +935 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:535
 msgid "My Data"
 msgstr ""
@@ -1044 +1053 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:752
-#: waeup/kofa/browser/pages.py:1144 waeup/kofa/browser/viewlets.py:393
+#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:756
+#: waeup/kofa/browser/pages.py:1148 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:694
 msgid "Data Center"
@@ -1054 +1063 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1020
+#: waeup/kofa/browser/pages.py:1024
 msgid "Edit headers or replace imported file!"
 msgstr ""
@@ -1063 +1072 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1067
+#: waeup/kofa/browser/pages.py:1071
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1068
+#: waeup/kofa/browser/pages.py:1072
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1112
+#: waeup/kofa/browser/pages.py:1116
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1114
+#: waeup/kofa/browser/pages.py:1118
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1122
+#: waeup/kofa/browser/pages.py:1126
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1124
+#: waeup/kofa/browser/pages.py:1128
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1125
+#: waeup/kofa/browser/pages.py:1129
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1147
+#: waeup/kofa/browser/pages.py:1151
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1155
+#: waeup/kofa/browser/pages.py:1159
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr ""
 
 #: waeup/kofa/browser/pages.py:116 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:240
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1187
 msgid "Edit data center settings"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1207
 msgid "File already existed (not copied): ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1210
 msgid "Given storage path cannot be used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1207
+#: waeup/kofa/browser/pages.py:1211
 msgid "Error: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1210
+#: waeup/kofa/browser/pages.py:1214
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1219
+#: waeup/kofa/browser/pages.py:1223
 msgid "Download portal data as CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1221
+#: waeup/kofa/browser/pages.py:1225
 msgid "Download"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1312
+#: waeup/kofa/browser/pages.py:1316
 msgid "Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1340
-#: waeup/kofa/browser/pages.py:1357 waeup/kofa/browser/pages.py:1361
+#: waeup/kofa/browser/pages.py:1328 waeup/kofa/browser/pages.py:1344
+#: waeup/kofa/browser/pages.py:1361 waeup/kofa/browser/pages.py:1365
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1325 waeup/kofa/university/export.py:35
+#: waeup/kofa/browser/pages.py:1329 waeup/kofa/university/export.py:35
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1329 waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1333 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1368
+#: waeup/kofa/browser/pages.py:1372
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1389 waeup/kofa/browser/pages.py:1399
+#: waeup/kofa/browser/pages.py:1393 waeup/kofa/browser/pages.py:1403
 #: waeup/kofa/university/export.py:66
 msgid "Departments"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1452
-#: waeup/kofa/browser/pages.py:1471 waeup/kofa/browser/pages.py:1475
+#: waeup/kofa/browser/pages.py:1405 waeup/kofa/browser/pages.py:1456
+#: waeup/kofa/browser/pages.py:1475 waeup/kofa/browser/pages.py:1479
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1409 waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1413 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1482
+#: waeup/kofa/browser/pages.py:1486
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1485
+#: waeup/kofa/browser/pages.py:1489
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1502
+#: waeup/kofa/browser/pages.py:1506
 msgid "Courses and Certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1532 waeup/kofa/browser/pages.py:1551
-#: waeup/kofa/students/browser.py:98 waeup/kofa/students/export.py:22
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/browser/pages.py:1536 waeup/kofa/browser/pages.py:1555
+#: waeup/kofa/students/browser.py:100 waeup/kofa/students/export.py:40
+#: waeup/kofa/students/viewlets.py:495
 msgid "Students"
 msgstr ""
 
 #: waeup/kofa/browser/pages.py:155 waeup/kofa/browser/viewlets.py:322
-#: waeup/kofa/browser/templates/staffsitelayout.pt:28
-#: waeup/kofa/browser/templates/studentsitelayout.pt:33
+#: waeup/kofa/browser/templates/staffsitelayout.pt:27
+#: waeup/kofa/browser/templates/studentsitelayout.pt:32
 msgid "Login"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1568 waeup/kofa/browser/pages.py:1626
+#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1630
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1568 waeup/kofa/browser/pages.py:1638
-#: waeup/kofa/browser/pages.py:1667 waeup/kofa/browser/pages.py:1671
+#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1671 waeup/kofa/browser/pages.py:1675
 msgid "Add course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1569 waeup/kofa/browser/pages.py:1632
+#: waeup/kofa/browser/pages.py:1573 waeup/kofa/browser/pages.py:1636
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1569 waeup/kofa/browser/pages.py:1643
-#: waeup/kofa/browser/pages.py:1704 waeup/kofa/browser/pages.py:1708
+#: waeup/kofa/browser/pages.py:1573 waeup/kofa/browser/pages.py:1647
+#: waeup/kofa/browser/pages.py:1708 waeup/kofa/browser/pages.py:1712
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1578 waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1582 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
@@ -1222 +1231 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1683
+#: waeup/kofa/browser/pages.py:1687
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1689
+#: waeup/kofa/browser/pages.py:1693
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1720
+#: waeup/kofa/browser/pages.py:1724
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1726
+#: waeup/kofa/browser/pages.py:1730
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1758 waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1762 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1808
-msgid "Edit certificate"
 msgstr ""
 
@@ -1252 +1257 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1815 waeup/kofa/browser/pages.py:1846
-#: waeup/kofa/browser/pages.py:1887 waeup/kofa/browser/pages.py:1889
+#: waeup/kofa/browser/pages.py:1812
+msgid "Edit certificate"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1819 waeup/kofa/browser/pages.py:1850
+#: waeup/kofa/browser/pages.py:1891 waeup/kofa/browser/pages.py:1893
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1816 waeup/kofa/browser/pages.py:1841
+#: waeup/kofa/browser/pages.py:1820 waeup/kofa/browser/pages.py:1845
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1822 waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1826 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1894
+#: waeup/kofa/browser/pages.py:1898
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1898
+#: waeup/kofa/browser/pages.py:1902
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1935 waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1939 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1938
+#: waeup/kofa/browser/pages.py:1942
 msgid "Save and return"
 msgstr ""
@@ -1291 +1300 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:237 waeup/kofa/browser/pages.py:523
+#: waeup/kofa/browser/pages.py:237 waeup/kofa/browser/pages.py:526
 msgid "Send message now"
 msgstr ""
 
 #: waeup/kofa/browser/pages.py:256 waeup/kofa/browser/pages.py:275
-#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:318
+#: waeup/kofa/browser/pages.py:543 waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr ""
@@ -1313 +1322 @@
 
 #: waeup/kofa/browser/pages.py:390 waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
-#: waeup/kofa/students/viewlets.py:283
+#: waeup/kofa/students/viewlets.py:166 waeup/kofa/students/viewlets.py:174
+#: waeup/kofa/students/viewlets.py:247 waeup/kofa/students/viewlets.py:255
+#: waeup/kofa/students/viewlets.py:304
 msgid "Manage"
 msgstr ""
@@ -1324 +1333 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:398
+#: waeup/kofa/browser/pages.py:399
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:430 waeup/kofa/browser/pages.py:432
+#: waeup/kofa/browser/pages.py:433 waeup/kofa/browser/pages.py:435
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1334 +1343 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:454
+#: waeup/kofa/browser/pages.py:457
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:473
+#: waeup/kofa/browser/pages.py:476
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:504
+#: waeup/kofa/browser/pages.py:507
 msgid "User settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:299
+#: waeup/kofa/browser/pages.py:524 waeup/kofa/students/browser.py:311
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:550 waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:553 waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:563 waeup/kofa/browser/viewlets.py:415
+#: waeup/kofa/browser/pages.py:567 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:598
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:621
+#: waeup/kofa/browser/pages.py:625
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:634
+#: waeup/kofa/browser/pages.py:638
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:684
+#: waeup/kofa/browser/pages.py:639 waeup/kofa/browser/pages.py:688
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:637 waeup/kofa/browser/pages.py:665
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:641 waeup/kofa/browser/pages.py:669
+#: waeup/kofa/browser/pages.py:700
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:662 waeup/kofa/browser/pages.py:735
+#: waeup/kofa/browser/pages.py:666 waeup/kofa/browser/pages.py:739
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:676
+#: waeup/kofa/browser/pages.py:680
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:687
+#: waeup/kofa/browser/pages.py:691
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:700
+#: waeup/kofa/browser/pages.py:704
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:707
+#: waeup/kofa/browser/pages.py:711
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:729
+#: waeup/kofa/browser/pages.py:733
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:759
+#: waeup/kofa/browser/pages.py:763
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:761
+#: waeup/kofa/browser/pages.py:765
 msgid "Upload"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:807 waeup/kofa/browser/pages.py:837
-#: waeup/kofa/browser/pages.py:957 waeup/kofa/browser/pages.py:1065
+#: waeup/kofa/browser/pages.py:811 waeup/kofa/browser/pages.py:841
+#: waeup/kofa/browser/pages.py:961 waeup/kofa/browser/pages.py:1069
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:821 waeup/kofa/browser/pages.py:922
-#: waeup/kofa/browser/pages.py:1041
+#: waeup/kofa/browser/pages.py:825 waeup/kofa/browser/pages.py:926
+#: waeup/kofa/browser/pages.py:1045
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:840
+#: waeup/kofa/browser/pages.py:844
 msgid "Back to step 1"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:841
+#: waeup/kofa/browser/pages.py:845
 msgid "Proceed to step 3"
 msgstr ""
@@ -1437 +1446 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:901
+#: waeup/kofa/browser/pages.py:905
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:909
+#: waeup/kofa/browser/pages.py:913
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:934
+#: waeup/kofa/browser/pages.py:938
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:960 waeup/kofa/browser/pages.py:1186
+#: waeup/kofa/browser/pages.py:964 waeup/kofa/browser/pages.py:1190
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:961
+#: waeup/kofa/browser/pages.py:965
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:962
+#: waeup/kofa/browser/pages.py:966
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:963
+#: waeup/kofa/browser/pages.py:967
 msgid "Perform import"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:124
+msgid "${footer_text} Page ${num1} of ${num2}"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:332
+msgid "Date: ${a}"
 msgstr ""
 
@@ -1644 +1663 @@
 #: waeup/kofa/browser/templates/datacenterpage.pt:16
 msgid "Upload Date"
+msgstr ""
+
+#: waeup/kofa/browser/templates/default_waeup_display_form.pt:6
+msgid "Uploaded Files"
 msgstr ""
 
@@ -1683 +1706 @@
 
 #: waeup/kofa/browser/templates/facultypage.pt:1
-#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
-msgid "There no subobjects registered yet."
+msgid "There are no subobjects registered yet."
+msgstr ""
+
+#: waeup/kofa/browser/templates/fileupload.pt:26
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:26
+msgid "Max. file size:"
 msgstr ""
 
 #: waeup/kofa/browser/templates/loginpage.pt:13
-#: waeup/kofa/browser/templates/usereditformpage.pt:8
+#: waeup/kofa/browser/templates/usereditformpage.pt:9
 #: waeup/kofa/students/browser_templates/basepage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:17
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:18
 #: waeup/kofa/students/browser_templates/change_password.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:31
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:32
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:25
 msgid "Password:"
 msgstr ""
@@ -1711 +1739 @@
 msgstr ""
 
-#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#. Default: "Or simply forgot your student id, application id or password? Then request a new password <strong><a href=\"sendpw\"> here</a></strong>."
 #: waeup/kofa/browser/templates/loginpage.pt:44
 msgid "login_trouble3"
@@ -1762 +1790 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:101
-#: waeup/kofa/browser/templates/studentsitelayout.pt:86
+#: waeup/kofa/browser/templates/staffsitelayout.pt:102
+#: waeup/kofa/browser/templates/studentsitelayout.pt:87
 msgid "Form Status:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
+#: waeup/kofa/browser/templates/staffsitelayout.pt:115
+#: waeup/kofa/browser/templates/studentsitelayout.pt:101
 msgid "Back to top"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:116
-#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+#: waeup/kofa/browser/templates/staffsitelayout.pt:117
+#: waeup/kofa/browser/templates/studentsitelayout.pt:103
 msgid "Kofa - Student Management System"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:119
-#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+#: waeup/kofa/browser/templates/staffsitelayout.pt:120
+#: waeup/kofa/browser/templates/studentsitelayout.pt:106
 msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:34
-#: waeup/kofa/browser/templates/studentsitelayout.pt:39
+#: waeup/kofa/browser/templates/staffsitelayout.pt:33
+#: waeup/kofa/browser/templates/studentsitelayout.pt:38
 msgid "Contact"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:40
-#: waeup/kofa/browser/templates/studentsitelayout.pt:45
+#: waeup/kofa/browser/templates/staffsitelayout.pt:39
+#: waeup/kofa/browser/templates/studentsitelayout.pt:44
 msgid "Logout"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:60
+#: waeup/kofa/browser/templates/staffsitelayout.pt:61
 msgid "Student Id:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:64
+#: waeup/kofa/browser/templates/staffsitelayout.pt:65
 msgid "State:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/usereditformpage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:23
+#: waeup/kofa/browser/templates/usereditformpage.pt:15
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:24
 #: waeup/kofa/students/browser_templates/change_password.pt:16
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:37
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:38
 msgid "Retype password:"
 msgstr ""
@@ -1815 +1843 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:158
 msgid "Send email"
 msgstr ""
@@ -1852 +1880 @@
 
 #: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/students/viewlets.py:239 waeup/kofa/students/viewlets.py:379
+#: waeup/kofa/students/viewlets.py:426
 msgid "Edit"
 msgstr ""
@@ -1928 +1956 @@
 #: waeup/kofa/hostels/browser.py:95
 msgid "Block ${a}, Room ${b}, Bed ${c}"
+msgstr ""
+
+#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
+msgid "There no subobjects registered yet."
 msgstr ""
 
@@ -1988 +2020 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:445
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:455
 msgid "Bed Type"
 msgstr ""
@@ -2157 +2189 @@
 
 #: waeup/kofa/interfaces.py:327
-msgid "Import mode"
+msgid "Import Mode"
 msgstr ""
 
@@ -2205 +2237 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:476
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:475
+#: waeup/kofa/interfaces.py:477
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:480
+#: waeup/kofa/interfaces.py:482
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:488
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:493
+#: waeup/kofa/interfaces.py:495
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:505
+#: waeup/kofa/interfaces.py:507
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:513
+#: waeup/kofa/interfaces.py:515
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:523
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:527
+#: waeup/kofa/interfaces.py:529
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:534
+#: waeup/kofa/interfaces.py:536
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:537
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:540
+#: waeup/kofa/interfaces.py:542
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:547
+#: waeup/kofa/interfaces.py:549
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:556
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:563 waeup/kofa/interfaces.py:621
+#: waeup/kofa/interfaces.py:565 waeup/kofa/interfaces.py:623
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:571 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:573 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:576
+#: waeup/kofa/interfaces.py:578
 msgid "Surcharge Portal Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:584
 msgid "Surcharge Payment Gateway Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:588 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:590 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:594
+#: waeup/kofa/interfaces.py:596
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:600
+#: waeup/kofa/interfaces.py:602
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:606 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:608 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2407 +2439 @@
 #: waeup/kofa/payments/interfaces.py:76
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:51
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:42
 msgid "Payment Date"
 msgstr ""
@@ -2425 +2457 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1000
+#: waeup/kofa/students/browser.py:1041
+msgid "Add online payment"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1044
 msgid "Create ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1008 waeup/kofa/students/browser.py:1230
+#: waeup/kofa/students/browser.py:1052 waeup/kofa/students/browser.py:1279
 msgid "Your current session does not match accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1077
+#: waeup/kofa/students/browser.py:1062
+msgid "Study course data are incomplete."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1126
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1090 waeup/kofa/students/browser.py:1098
-#: waeup/kofa/students/browser.py:1106
+#: waeup/kofa/students/browser.py:1139 waeup/kofa/students/browser.py:1147
+#: waeup/kofa/students/browser.py:1155
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1209
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1172
+#: waeup/kofa/students/browser.py:121 waeup/kofa/students/viewlets.py:117
+#: waeup/kofa/students/viewlets.py:557
+msgid "Study Course"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1221
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1179
+#: waeup/kofa/students/browser.py:1228
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
-#: waeup/kofa/students/viewlets.py:534
-msgid "Study Course"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1210
+#: waeup/kofa/students/browser.py:1259
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1212
+#: waeup/kofa/students/browser.py:1261
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1220
+#: waeup/kofa/students/browser.py:1269
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1224
+#: waeup/kofa/students/browser.py:127 waeup/kofa/students/viewlets.py:123
+#: waeup/kofa/students/viewlets.py:558
+msgid "Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1273
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1235
+#: waeup/kofa/students/browser.py:1284
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1246 waeup/kofa/students/browser.py:1543
-#: waeup/kofa/students/browser.py:1656
+#: waeup/kofa/students/browser.py:1295 waeup/kofa/students/browser.py:1592
+#: waeup/kofa/students/browser.py:1712
 msgid "Activation code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
-#: waeup/kofa/students/viewlets.py:535
-msgid "Payments"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1394
+#. Default: ""
+#: waeup/kofa/students/browser.py:1315 waeup/kofa/students/browser.py:1443
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1271 waeup/kofa/students/browser.py:1548
-#: waeup/kofa/students/browser.py:1661
+#: waeup/kofa/students/browser.py:1320 waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1717
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1551
-#: waeup/kofa/students/browser.py:1664 waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1323 waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1720 waeup/kofa/students/browser.py:1988
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1279 waeup/kofa/students/browser.py:1555
-#: waeup/kofa/students/browser.py:1669
+#: waeup/kofa/students/browser.py:1328 waeup/kofa/students/browser.py:1604
+#: waeup/kofa/students/browser.py:1725
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290 waeup/kofa/students/browser.py:1408
+#: waeup/kofa/students/browser.py:1339 waeup/kofa/students/browser.py:1457
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1299
+#: waeup/kofa/students/browser.py:1348
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1317
+#: waeup/kofa/students/browser.py:1366
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1382
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1339
+#: waeup/kofa/students/browser.py:1388
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:1415
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1372
+#: waeup/kofa/students/browser.py:142 waeup/kofa/students/viewlets.py:129
+msgid "Accommodation"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1421
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
-msgid "Accommodation"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1415
+#. Default: ""
+#: waeup/kofa/students/browser.py:1464
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1434
+#: waeup/kofa/students/browser.py:1483
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1447
+#: waeup/kofa/students/browser.py:1496
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1462 waeup/kofa/students/viewlets.py:365
+#. Default: ""
+#: waeup/kofa/students/browser.py:151
+msgid "Bed Ticket ${a}"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1511 waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1476
+#: waeup/kofa/students/browser.py:1525
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1488
+#: waeup/kofa/students/browser.py:1537
 msgid "Upload portrait"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:149
-msgid "Bed Ticket ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1503 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1552 waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1507
+#: waeup/kofa/students/browser.py:1556
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
+#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1701
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1528
+#: waeup/kofa/students/browser.py:1577
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1532
+#: waeup/kofa/students/browser.py:1581
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1559
+#: waeup/kofa/students/browser.py:1608
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1571
+#: waeup/kofa/students/browser.py:1618
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1639 waeup/kofa/students/browser.py:1653
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1647
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1606 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1662 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1663
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1666
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/students/browser.py:1675
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1628
+#: waeup/kofa/students/browser.py:1684
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1637 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1693 waeup/kofa/students/viewlets.py:441
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1641
+#: waeup/kofa/students/browser.py:1697
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1677
+#: waeup/kofa/students/browser.py:170
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1733
 msgid "Course registration has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:168
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1696
+#. Default: ""
+#: waeup/kofa/students/browser.py:1752
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1705
+#: waeup/kofa/students/browser.py:1761
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1744
+#: waeup/kofa/students/browser.py:1800
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1781
+#: waeup/kofa/students/browser.py:1837
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1785
+#: waeup/kofa/students/browser.py:1841
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1831
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:226
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1887
+msgid "Send me a new password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1897
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1855
-msgid "No student record found."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1863
+#: waeup/kofa/students/browser.py:1914
+msgid "Application package not installed."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1920
+msgid "No record found."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1928
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1868
+#: waeup/kofa/students/browser.py:1933
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1879
+#: waeup/kofa/students/browser.py:1944
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1882
+#: waeup/kofa/students/browser.py:1947
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1962
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1905
+#: waeup/kofa/students/browser.py:1970
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1973
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1979
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1920
+#: waeup/kofa/students/browser.py:1985
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1929
+#: waeup/kofa/students/browser.py:1994
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:208 waeup/kofa/students/viewlets.py:142
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1894
+#: waeup/kofa/students/browser.py:238 waeup/kofa/students/browser.py:1959
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:265 waeup/kofa/students/viewlets.py:149
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:261
+#: waeup/kofa/students/browser.py:273
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:277
+#: waeup/kofa/students/browser.py:289
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1871
+#: waeup/kofa/students/browser.py:332 waeup/kofa/students/browser.py:1936
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:344
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:407
+#: waeup/kofa/students/browser.py:425
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:423 waeup/kofa/students/viewlets.py:104
-#: waeup/kofa/students/viewlets.py:532
+#: waeup/kofa/students/browser.py:449 waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
 msgid "Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:429
+#: waeup/kofa/students/browser.py:455
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:449
+#: waeup/kofa/students/browser.py:474
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:478
+#: waeup/kofa/students/browser.py:516
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:480 waeup/kofa/students/browser.py:504
+#: waeup/kofa/students/browser.py:518 waeup/kofa/students/browser.py:542
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:535
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:539
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:527
+#: waeup/kofa/students/browser.py:565
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:537
-msgid "Manage personal data"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:557
+#: waeup/kofa/students/browser.py:575
+msgid "Edit personal data"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:595
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:587
+#: waeup/kofa/students/browser.py:625
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:631
+#: waeup/kofa/students/browser.py:628 waeup/kofa/students/browser.py:675
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:591 waeup/kofa/students/browser.py:617
+#: waeup/kofa/students/browser.py:629 waeup/kofa/students/browser.py:661
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:649
+msgid "Current level not available for certificate."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:669
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:627 waeup/kofa/students/browser.py:1714
+#: waeup/kofa/students/browser.py:671 waeup/kofa/students/browser.py:1770
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:637
+#: waeup/kofa/students/browser.py:681
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:673
+#: waeup/kofa/students/browser.py:717
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:696
+#: waeup/kofa/students/browser.py:740
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:746
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:755
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:761
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2857 +2905 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:720
+#: waeup/kofa/students/browser.py:764
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2863 +2911 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:721
+#: waeup/kofa/students/browser.py:765
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:722
+#: waeup/kofa/students/browser.py:766
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2874 +2922 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:723
+#: waeup/kofa/students/browser.py:767
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2880 +2928 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:724 waeup/kofa/students/interfaces.py:389
+#: waeup/kofa/students/browser.py:768 waeup/kofa/students/interfaces.py:399
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2887 +2935 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:752 waeup/kofa/students/browser.py:781
-#: waeup/kofa/students/browser.py:866 waeup/kofa/students/browser.py:871
-#: waeup/kofa/students/browser.py:1754 waeup/kofa/students/browser.py:1804
+#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:825
+#: waeup/kofa/students/browser.py:910 waeup/kofa/students/browser.py:915
+#: waeup/kofa/students/browser.py:1810 waeup/kofa/students/browser.py:1860
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:773
+#: waeup/kofa/students/browser.py:817
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:791 waeup/kofa/students/browser.py:1764
+#: waeup/kofa/students/browser.py:835 waeup/kofa/students/browser.py:1820
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:859 waeup/kofa/students/browser.py:881
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:819
+#: waeup/kofa/students/browser.py:863
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:821 waeup/kofa/students/browser.py:849
+#: waeup/kofa/students/browser.py:865 waeup/kofa/students/browser.py:893
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:842
+#: waeup/kofa/students/browser.py:886
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:846
+#: waeup/kofa/students/browser.py:890
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:886 waeup/kofa/students/browser.py:1817
+#: waeup/kofa/students/browser.py:930 waeup/kofa/students/browser.py:1873
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:888 waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:932 waeup/kofa/students/browser.py:1875
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:909
+#: waeup/kofa/students/browser.py:953
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:925
+#: waeup/kofa/students/browser.py:969
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:952
+#: waeup/kofa/students/browser.py:996
 msgid "${a}: Payments"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:997
-msgid "Add online payment"
 msgstr ""
 
@@ -2954 +2998 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:29
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:30
 msgid "Registration Transition:"
-msgstr ""
-
-#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
-#: waeup/kofa/students/browser_templates/changepw.pt:8
-msgid "solve_captcha"
 msgstr ""
 
@@ -3010 +3049 @@
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:14
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:25
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:54
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:45
 msgid "State"
 msgstr ""
@@ -3030 +3069 @@
 msgstr ""
 
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
+msgid "Faculty:"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
+msgid "Department:"
+msgstr ""
+
 #: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:31
 msgid "Semester:"
@@ -3046 +3095 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
-#: waeup/kofa/students/browser_templates/fileupload.pt:26
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
-msgid "Max. file size:"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:11
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+msgid "Category"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:44
+msgid "Item"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:40
+msgid "Payment Id"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:52
-msgid "Category"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:53
-msgid "Item"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:82
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:49
-msgid "Payment Id"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:83
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:50
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:41
 msgid "Creation Date"
+msgstr ""
+
+#. Default: "Enter the email address stored on Kofa. You can't change your email address here. If you've forgotten your email address or the email address stored in Kofa is wrong or no longer valid, use the enquiries form to request a change of address."
+#: waeup/kofa/students/browser_templates/sendpassword.pt:19
+msgid "email_address_problem"
+msgstr ""
+
+#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
+#: waeup/kofa/students/browser_templates/sendpassword.pt:8
+msgid "solve_captcha"
 msgstr ""
 
@@ -3175 +3228 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:259
-#: waeup/kofa/students/interfaces.py:498
-msgid "Registration Number"
-msgstr ""
-
-#: waeup/kofa/students/interfaces.py:190 waeup/kofa/students/interfaces.py:268
+#: waeup/kofa/students/export.py:139
+msgid "Student Study Levels"
+msgstr ""
+
+#: waeup/kofa/students/export.py:87
+msgid "Student Study Courses"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:190 waeup/kofa/students/interfaces.py:278
 msgid "Matriculation Number"
 msgstr ""
@@ -3204 +3260 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:245
+#: waeup/kofa/students/interfaces.py:244
+msgid "Employer"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:254
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:277
+#: waeup/kofa/students/interfaces.py:287
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:283
+#: waeup/kofa/students/interfaces.py:293
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:300
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:298 waeup/kofa/students/interfaces.py:337
+#: waeup/kofa/students/interfaces.py:308 waeup/kofa/students/interfaces.py:347
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:305 waeup/kofa/students/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:315 waeup/kofa/students/interfaces.py:353
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:312 waeup/kofa/students/interfaces.py:331
+#: waeup/kofa/students/interfaces.py:322 waeup/kofa/students/interfaces.py:341
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:319
+#: waeup/kofa/students/interfaces.py:329
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:357 waeup/kofa/students/interfaces.py:451
+#: waeup/kofa/students/interfaces.py:367 waeup/kofa/students/interfaces.py:461
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3245 +3305 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:373
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:382
+#: waeup/kofa/students/interfaces.py:392
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3255 +3315 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:396
+#: waeup/kofa/students/interfaces.py:406
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:413
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:422
+#: waeup/kofa/students/interfaces.py:432
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3270 +3330 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:439
+#: waeup/kofa/students/interfaces.py:449
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:458
+#: waeup/kofa/students/interfaces.py:468
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:464
+#: waeup/kofa/students/interfaces.py:474
 msgid "Booking Activation Code"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/utils.py:167
+#: waeup/kofa/students/utils.py:173
+msgid "Scanned Documents"
+msgstr ""
+
+#: waeup/kofa/students/utils.py:181
+msgid "(not provided)"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/utils.py:208
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
-#: waeup/kofa/students/viewlets.py:99
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:6
+#: waeup/kofa/students/utils.py:323 waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/viewlets.py:102
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:7
 msgid "Base Data"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:329
-msgid "Scanned Documents"
-msgstr ""
-
-#: waeup/kofa/students/utils.py:382
+#: waeup/kofa/students/utils.py:355
 msgid "(not yet)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:112 waeup/kofa/students/viewlets.py:556
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:134 waeup/kofa/students/viewlets.py:560
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:182 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:194
+#: waeup/kofa/students/viewlets.py:197
 msgid "Reject clearance"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:210
+#: waeup/kofa/students/viewlets.py:213
 msgid "Download clearance slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:235
+#: waeup/kofa/students/viewlets.py:222 waeup/kofa/students/viewlets.py:231
+msgid "View"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:263 waeup/kofa/students/workflow.py:128
+msgid "Validate courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:279
+msgid "Reject courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:296
 msgid "Download course registration slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
-msgid "Validate courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:267
-msgid "Reject courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:330
+#: waeup/kofa/students/viewlets.py:353
 msgid "Book accommodation"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:339
+#: waeup/kofa/students/viewlets.py:362
 msgid "Download bed allocation slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:348
+#: waeup/kofa/students/viewlets.py:371
 msgid "Relocate student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:374
+#: waeup/kofa/students/viewlets.py:397
 msgid "Change portrait"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:432
+#: waeup/kofa/students/viewlets.py:455
 msgid "Add course list"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:450
+#: waeup/kofa/students/viewlets.py:473
 msgid "Add and remove courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:536
+#: waeup/kofa/students/viewlets.py:559
 msgid "Accommodation Data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:548
+#: waeup/kofa/students/viewlets.py:571
 msgid "${a} deleted."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:561
+#: waeup/kofa/students/viewlets.py:584
 msgid "File name has no extension."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:564
+#: waeup/kofa/students/viewlets.py:587
 msgid "File name contains more than one dot."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:571
+#: waeup/kofa/students/viewlets.py:594
 msgid "${a} file extension expected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:577
+#: waeup/kofa/students/viewlets.py:600
 msgid "Only the following extension are allowed: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:583
+#: waeup/kofa/students/viewlets.py:606
 msgid "Uploaded file is too big."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:590
+#: waeup/kofa/students/viewlets.py:613
 msgid "File ${a} uploaded."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:608
+#: waeup/kofa/students/viewlets.py:631
 #: waeup/kofa/browser/templates/datacenterlogspage.pt:10
 #: waeup/kofa/browser/templates/datacenterpage.pt:14
@@ -3403 +3471 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:609
+#: waeup/kofa/students/viewlets.py:632
 msgid "Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:632
+#: waeup/kofa/students/viewlets.py:655
 msgid "Upload new file"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:633
+#: waeup/kofa/students/viewlets.py:656
 msgid "Delete attachment"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:663
+#: waeup/kofa/students/viewlets.py:686
 msgid "No local file selected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:677
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:8
+#: waeup/kofa/students/viewlets.py:700
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:688
+#: waeup/kofa/students/viewlets.py:711
 msgid "Passport Picture (jpg only)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:726 waeup/kofa/students/viewlets.py:737
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:727 waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:747 waeup/kofa/students/viewlets.py:758
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:748 waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:85
+#: waeup/kofa/students/viewlets.py:88
 msgid "Application Slip"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:117
+#: waeup/kofa/students/vocabularies.py:116
 msgid "male"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:119
+#: waeup/kofa/students/vocabularies.py:118
 msgid "female"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:77
+#: waeup/kofa/students/vocabularies.py:76
 msgid "Error: level id ${value} out of range"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:88
+#: waeup/kofa/students/vocabularies.py:87
 msgid "${title} 2nd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:91
+#: waeup/kofa/students/vocabularies.py:90
 msgid "${title} 3rd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:94
+#: waeup/kofa/students/vocabularies.py:93
 msgid "${title} 1st spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:96
+#: waeup/kofa/students/vocabularies.py:95
 msgid "${title} on 1st probation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:98
+#: waeup/kofa/students/vocabularies.py:97
 msgid "${title} on 2nd probation"
 msgstr ""
@@ -3490 +3558 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:108
-msgid "Student record reset to 'returning'"
+#: waeup/kofa/students/workflow.py:108 waeup/kofa/students/workflow.py:143
+msgid "Reset to 'returning'"
 msgstr ""
 
@@ -3507 +3575 @@
 
 #: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
-msgid "Student record reset to 'paid'"
+msgid "Reset to 'paid'"
 msgstr ""
 
@@ -3518 +3586 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:143
-msgid "Returned"
-msgstr ""
-
 #: waeup/kofa/students/workflow.py:149
 msgid "Reset to validated"
@@ -3527 +3591 @@
 
 #: waeup/kofa/students/workflow.py:150
-msgid "Student record reset to 'validated'"
+msgid "Reset to 'validated'"
 msgstr ""
 
@@ -3547 +3611 @@
 
 #: waeup/kofa/students/workflow.py:38
-msgid "Student record reset"
+msgid "Reset to initial state"
 msgstr ""
 
@@ -3559 +3623 @@
 
 #: waeup/kofa/students/workflow.py:52
-msgid "Student record reset to 'admitted'"
+msgid "Reset to 'admitted'"
 msgstr ""
 
@@ -3571 +3635 @@
 
 #: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
-msgid "Student record reset to 'clearance'"
+msgid "Reset to 'clearance'"
 msgstr ""
 
@@ -3591 +3655 @@
 
 #: waeup/kofa/students/workflow.py:94
-msgid "Student record reset to 'cleared'"
+msgid "Reset to 'cleared'"
 msgstr ""
 
@@ -3726 +3790 @@
 msgstr ""
 
+#: waeup/kofa/university/vocabularies.py:38
+msgid "900 (Year 9)"
+msgstr ""
+
 #: waeup/kofa/utils/countries.py:10
 msgid "Albania"
@@ -4722 +4790 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:149
+#: waeup/kofa/utils/utils.py:150
 msgid ""
 "Fullname: ${a}\n"
@@ -4732 +4800 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:194
+#: waeup/kofa/utils/utils.py:195
 msgid ""
 "Dear ${a},\n"
@@ -4756 +4824 @@
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:117
+#: waeup/kofa/widgets/phonewidget.py:118
 msgid "Empty phone field(s)."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:121
+#: waeup/kofa/widgets/phonewidget.py:122
 msgid "Int. prefix requires format '+NNN'"
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:127
+#: waeup/kofa/widgets/phonewidget.py:131
 msgid "Phone numbers may contain numbers only."
 msgstr ""

main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

@@ -38 +38 @@
     def __init__(self):
         super(Payment, self).__init__()
-        try:
-            tz = getUtility(IKofaUtils).tzinfo
-        except:
-            #In unit tests KofaUtils is not available.
-            tz = None
-        self.creation_date = datetime.now(tz)
+        self.creation_date = datetime.utcnow()
         self.p_id = None
         return

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

@@ -62 +62 @@
     def __init__(self):
         super(BedTicket, self).__init__()
-        tz = getUtility(IKofaUtils).tzinfo
-        self.booking_date = datetime.now(tz)
+        self.booking_date = datetime.utcnow()
         self.bed = None
         return

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

@@ -1145 +1145 @@
         self.context.r_code = u'00'
         self.context.p_state = 'paid'
-        tz = getUtility(IKofaUtils).tzinfo
-        self.context.payment_date = datetime.now(tz)
+        self.context.payment_date = datetime.utcnow()
         if self.context.p_category == 'clearance':
             # Create CLR access code

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -121 +121 @@
         # Create 5 access codes with prefix'PWD'
         pin_container = self.app['accesscodes']
-        tz = getUtility(IKofaUtils).tzinfo
         pin_container.createBatch(
-            datetime.now(tz), 'some_userid', 'PWD', 9.99, 5)
+            datetime.utcnow(), 'some_userid', 'PWD', 9.99, 5)
         pins = pin_container['PWD-1'].values()
         self.pwdpins = [x.representation for x in pins]

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py

@@ -80 +80 @@
     def test_booking_date(self):
         isinstance(self.bedticket.booking_date.tzinfo, tzinfo)
-        self.assertEqual(str(self.bedticket.booking_date.tzinfo), 'UTC')
+        self.assertEqual(self.bedticket.booking_date.tzinfo, None)
         return