diff -r b12de918d660 -r 8b5611d5b053 app/soc/models/group_app.py --- a/app/soc/models/group_app.py Sat Jan 24 21:38:28 2009 +0000 +++ b/app/soc/models/group_app.py Sat Jan 24 23:56:34 2009 +0000 @@ -23,7 +23,7 @@ from google.appengine.ext import db -from django.utils.translation import ugettext_lazy +from django.utils.translation import ugettext import soc.models.document import soc.models.linkable @@ -42,8 +42,8 @@ #: if the Group Application is accepted. #: See also: soc.models.group.Group.name name = db.StringProperty(required=True, - verbose_name=ugettext_lazy('Group Name')) - name.help_text = ugettext_lazy('Complete, formal name of the group.') + verbose_name=ugettext('Group Name')) + name.help_text = ugettext('Complete, formal name of the group.') #: Required many:1 relationship indicating the User who is applying on #: behalf of the Group. If the Group Application is accepted, this User @@ -51,51 +51,51 @@ #: See also: soc.models.group.Group.founder applicant = db.ReferenceProperty(reference_class=soc.models.user.User, required=True, collection_name='group_apps', - verbose_name=ugettext_lazy('Applicant')) + verbose_name=ugettext('Applicant')) #: Required field indicating the home page URL of the applying Group. #: See also: soc.models.group.Group.home_page home_page = db.LinkProperty(required=True, - verbose_name=ugettext_lazy('Home Page URL')) + verbose_name=ugettext('Home Page URL')) #: Required email address used as the "public" contact mechanism for #: the Group (as opposed to the applicant.account email address which is #: kept secret, revealed only to Developers). #: See also: soc.models.group.Group.email email = db.EmailProperty(required=True, - verbose_name=ugettext_lazy('Public Email')) + verbose_name=ugettext('Public Email')) #: Required description of the Group. description = db.TextProperty(required=True, - verbose_name=ugettext_lazy('Description')) + verbose_name=ugettext('Description')) why_applying = db.TextProperty(required=True, - verbose_name=ugettext_lazy( + verbose_name=ugettext( 'Why is your group applying to participate?' ' What do you hope to gain by participating?')) pub_mailing_list = db.StringProperty(required=False, - verbose_name=ugettext_lazy( + verbose_name=ugettext( 'What is the main public mailing list for your group?')) - pub_mailing_list.help_text = ugettext_lazy( + pub_mailing_list.help_text = ugettext( 'Mailing list email address, URL to sign-up page, etc.') irc_channel = db.StringProperty(required=False, - verbose_name=ugettext_lazy( + verbose_name=ugettext( 'Where is the main IRC channel for your group?')) - irc_channel.help_text = ugettext_lazy('IRC network and channel.') + irc_channel.help_text = ugettext('IRC network and channel.') backup_admin = db.ReferenceProperty(reference_class=soc.models.user.User, required=True, collection_name='group_app_backup_admin', - verbose_name=ugettext_lazy( + verbose_name=ugettext( 'Please select your backup group administrator.')) backup_admin.redirect_url = soc.models.user.User.URL_NAME member_criteria = db.TextProperty(required=True, - verbose_name=ugettext_lazy( + verbose_name=ugettext( 'What criteria do you use to select the members of your group?' ' Please be as specific as possible.')) - member_criteria.help_text = ugettext_lazy( + member_criteria.help_text = ugettext( 'Members include mentors, admininstrators, and the like.') # property containing the status of the application @@ -103,14 +103,14 @@ status = db.StringProperty(required=True, choices=['accepted','rejected','ignored','needs review','completed'], default='needs review', - verbose_name=ugettext_lazy('Application Status')) + verbose_name=ugettext('Application Status')) # timestamp to record the time on which this application has been created created_on = db.DateTimeProperty(required=True, auto_now_add=True, - verbose_name=ugettext_lazy('Created on')) + verbose_name=ugettext('Created on')) # timestamp to record the time on which this application has been last modified # also changes when the review properties change last_modified_on = db.DateTimeProperty(required=True, auto_now=True, - verbose_name=ugettext_lazy('Last modified on')) + verbose_name=ugettext('Last modified on'))