Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils/utils.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/utils/utils.py (modified) (4 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils/utils.py

@@ -123 +123 @@
 
     STUDY_MODES_DICT = {
-        'transfer': 'Transfer',
         'ug_ft': 'Undergraduate Full-Time',
         'ug_pt': 'Undergraduate Part-Time',
@@ -193 +192 @@
 
 
-    def sendCredentials(self, user, password=None, url_info=None, msg=None):
+    def sendCredentials(self, user, password=None, login_url=None, msg=None):
         """Send credentials as email.
 
@@ -210 +209 @@
 Your user name: ${d}
 Your password: ${e}
-${f}
+Login page: ${f}
 
 Please remember your user name and keep
@@ -231 +230 @@
             'd':user.name,
             'e':password,
-            'f':url_info})
+            'f':login_url})
 
         body = translate(text, 'waeup.kofa',