diff -r 3a04703a7fe3 -r d3e85f6144cc app/soc/models/group.py --- a/app/soc/models/group.py Tue Oct 14 22:57:52 2008 +0000 +++ b/app/soc/models/group.py Wed Oct 15 13:47:10 2008 +0000 @@ -60,22 +60,23 @@ #: Group (this relationship is needed to keep track of lifetime group #: creation limits, used to prevent spamming, etc.). founder = db.ReferenceProperty(reference_class=soc.models.user.User, - required=True, collection_name="groups") - #: Optional field storing a home page URL of the group. + required=True, collection_name="groups", + verbose_name=ugettext_lazy('Created by')) + #: Required field storing a home page URL of the group. home_page = db.LinkProperty(required=True, verbose_name=ugettext_lazy('Home Page URL')) - #: Optional email address used as the "public" contact mechanism for + #: Required email address used as the "public" contact mechanism for #: the Group (as opposed to the founder.id email address which is kept #: secret, revealed only to Developers). email = db.EmailProperty(required=True, verbose_name=ugettext_lazy('Email')) - #: Optional field storing description of the group. + #: Required field storing description of the group. description = db.TextProperty(required=True, verbose_name=ugettext_lazy('Description')) - #: Optional field containing a group street address. + #: Required field containing a group street address. #: Group street address can only be lower ASCII, not UTF-8 text, #: because, if supplied, it is used as a shipping address. street = db.StringProperty(required=True, @@ -83,14 +84,14 @@ street.help_text = ugettext_lazy( 'street number and name, lower ASCII characters only') - #: Optional field containing group address city. + #: Required field containing group address city. #: City can only be lower ASCII, not UTF-8 text, because, if #: supplied, it is used as a shipping address. city = db.StringProperty(required=True, verbose_name=ugettext_lazy('City')) city.help_text = ugettext_lazy('lower ASCII characters only') - #: Optional field containing group address state or province. + #: Required field containing group address state or province. #: Group state/province can only be lower ASCII, not UTF-8 #: text, because, if supplied, it is used as a shipping address. state = db.StringProperty(required=True, @@ -99,19 +100,19 @@ 'optional if country/territory does not have states or provinces, ' 'lower ASCII characters only') - #: Optional field containing address country or territory of the group. + #: Required field containing address country or territory of the group. country = db.StringProperty(required=True, verbose_name=ugettext_lazy('Country/Territory'), choices=countries.COUNTRIES_AND_TERRITORIES) - #: Optional field containing address postal code of the group (ZIP code in + #: Required field containing address postal code of the group (ZIP code in #: the United States). Postal code can only be lower ASCII, not UTF-8 #: text, because, if supplied, it is used as a shipping address. postalcode = db.StringProperty(required=True, verbose_name=ugettext_lazy('ZIP/Postal Code')) postalcode.help_text=ugettext_lazy('lower ASCII characters only') - #: Optional contact phone number that will be, amongst other uses, + #: Required contact phone number that will be, amongst other uses, #: supplied to shippers along with the shipping address; kept private. phone = db.PhoneNumberProperty(required=True, verbose_name=ugettext_lazy('Phone Number'))