Changeset 14252 for main/waeup.aaue/trunk

Timestamp:

2 Nov 2016, 17:00:57 (8 years ago)

Author:

Henrik Bettermann

Message:

Raise error message if TicketError? occurs.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (1 diff)
• students/studylevel.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -138 +138 @@
 msgstr "<b>Units: ${a}</b>"
 
-msgid "Course ${a} cannot be registered."
-msgstr ""
-"Course ${a} cannot be registered. You have to pay for the 2nd semester first."
-
 #: school_fee_1
 msgid "Initial School Fee"

main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

@@ -191 +191 @@
         # schoolfee has not yet been fully paid.
         if course.semester == 2 and not self._schoolfeePaymentMade():
-            raise TicketError
+            raise TicketError(
+                _('%s is a 2nd semester course which can only be added '
+                  'if school fees have been fully paid.' % course.code))
         ticket.code = course.code
         ticket.title = course.title

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

@@ -816 +816 @@
         self.browser.getControl("Add course ticket").click()
         self.assertTrue(
-            'Course COURSE1 cannot be registered. '
-            'You have to pay for the 2nd semester first.'
+            'COURSE1 is a 2nd semester course which can only '
+            'be added if school fees have been fully paid.'
             in self.browser.contents)
         # 2nd instalment has to be paid first