Changeset 13076 for main/waeup.kofa/trunk/src/waeup

Timestamp:

19 Jun 2015, 05:49:57 (9 years ago)

Author:

Henrik Bettermann

Message:

After careful consideration: plural is more appropriate than singular.

A student section has another meaning: ​https://en.wikipedia.org/wiki/Student_section

Location:

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

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/interfaces.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (4 diffs)
• applicants/utils.py (modified) (1 diff)
• applicants/viewlets.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/interfaces.py (modified) (1 diff)
• students/permissions.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)
• students/viewlets.py (modified) (1 diff)
• students/vocabularies.py (modified) (1 diff)
• university/catalog.py (modified) (1 diff)

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

@@ -72 +72 @@
     grok.require('waeup.Public')
     form_fields = grok.AutoFields(IApplicantsRoot)
-    label = _('Applicant Section')
+    label = _('Applicants Section')
     pnav = 3
 
@@ -127 +127 @@
     grok.template('applicantsrootmanagepage')
     form_fields = grok.AutoFields(IApplicantsRoot)
-    label = _('Manage applicant section')
+    label = _('Manage applicants section')
     pnav = 3
     grok.require('waeup.manageApplication')

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

@@ -476 +476 @@
 
     This reduced interface is for former students or students who are not
-    users of the portal but have to pay supplementary fees.
+    student users of the portal but have to pay supplementary fees.
 
     This interface is used in browser components only. Thus we can't add

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

@@ -204 +204 @@
         self.assertRaises(
             LinkNotFoundError,
-            self.browser.getLink, 'Manage applicant section')
+            self.browser.getLink, 'Manage applicants section')
         self.assertRaises(
             Unauthorized, self.browser.open, self.manage_root_path)
@@ -216 +216 @@
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.root_path)
-        self.assertTrue('Manage applicant section' in self.browser.contents)
+        self.assertTrue('Manage applicants section' in self.browser.contents)
         # There is a manage link
-        link = self.browser.getLink('Manage applicant section')
+        link = self.browser.getLink('Manage applicants section')
         link.click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
@@ -252 +252 @@
         self.browser.getControl("Save").click()
         self.browser.open(self.root_path)
-        self.assertTrue('Manage applicant section' in self.browser.contents)
+        self.assertTrue('Manage applicants section' in self.browser.contents)
         # There is a search link
         link = self.browser.getLink('Find applicants')
@@ -562 +562 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertFalse('Search' in self.browser.contents)
-        self.assertFalse('Manage applicant section' in self.browser.contents)
+        self.assertFalse('Manage applicants section' in self.browser.contents)
         # ... and can't access the manage page
         self.assertRaises(

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

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""General helper functions and utilities for the applicant section.
+"""General helper functions and utilities for the applicants section.
 """
 

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

@@ -97 +97 @@
     grok.view(ApplicantsRootPage)
     grok.require('waeup.manageApplication')
-    text = _('Manage applicant section')
+    text = _('Manage applicants section')
 
 class ApplicantRegisterActionButton(ManageActionButton):

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

@@ -288 +288 @@
     grok.template('containermanagepage')
     pnav = 4
-    label = _('Manage student section')
+    label = _('Manage students section')
     search_button = _('Find student(s)')
     remove_button = _('Remove selected')

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

@@ -179 +179 @@
 class IStudentNavigation(IStudentNavigationBase):
     """Interface needed for navigation and logging. This interface is
-    implemented by all content classes in the student section.
+    implemented by all content classes in the students section.
     """
     student = Attribute('Student object of context')

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

@@ -17 +17 @@
 ##
 """
-Permissions for the student section.
+Permissions for the students section.
 """
 import grok
 
-# Student section permissions
+# Students section permissions
 
 class HandleStudent(grok.Permission):

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

@@ -257 +257 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.container_path)
-        self.browser.getLink("Manage student section").click()
+        self.browser.getLink("Manage students section").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.manage_container_path)

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

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""General helper functions and utilities for the student section.
+"""General helper functions and utilities for the students section.
 """
 import grok

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

@@ -139 +139 @@
     grok.view(StudentsContainerPage)
     grok.require('waeup.manageStudent')
-    text = _('Manage student section')
+    text = _('Manage students section')
 
 class StudentsContainerAddActionButton(AddActionButton):

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

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""Vocabularies and sources for the student section.
+"""Vocabularies and sources for the students section.
 """
 from zope.component import getUtility, queryUtility

main/waeup.kofa/trunk/src/waeup/kofa/university/catalog.py

@@ -57 +57 @@
 class CertificateCoursesIndexes(grok.Indexes):
     """This catalog is needed for automatic removal of certificate courses
-    and later for selection of course tickets in the student section.
+    and later for selection of course tickets in the students section.
     """
     grok.site(IUniversity)