py_tasks_melange: comparison app/soc/models/role.py

equal deleted inserted replaced

-:b12de918d660
+:8b5611d5b053
 ]
 from google.appengine.ext import db
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import ugettext
 from soc.models import countries
 import soc.models.linkable
 import soc.models.user
 #: Required field storing the parts of the Role's name
 #: corresponding to the field names; displayed publicly.
 #: given_name can only be lower ASCII, not UTF-8 text, because it is
 #: used, for example, as part of the shipping (mailing) address.
 given_name = db.StringProperty(required=True,
-verbose_name=ugettext_lazy('First (given) name'))
+verbose_name=ugettext('First (given) name'))
-given_name.help_text = ugettext_lazy('lower ASCII characters only')
+given_name.help_text = ugettext('lower ASCII characters only')
 #: Required field storing the parts of the Role's name
 #: corresponding to the field names; displayed publicly.
 #: Surname can only be lower ASCII, not UTF-8 text, because it is
 #: used, for example, as part of the shipping (mailing) address.
 surname = db.StringProperty(
 required=True,
-verbose_name=ugettext_lazy('Last (family) name'))
+verbose_name=ugettext('Last (family) name'))
-surname.help_text = ugettext_lazy('lower ASCII characters only')
+surname.help_text = ugettext('lower ASCII characters only')
 #: Optional field used as a display name, such as for awards
 #: certificates. Should be the entire display name in the format
 #: the Role would like it displayed (could be surname followed by
 #: given name in some cultures, for example). Display names can be
 #: any valid UTF-8 text.
 display_name = db.StringProperty(
-verbose_name=ugettext_lazy('Display Name'))
+verbose_name=ugettext('Display Name'))
-display_name.help_text = ugettext_lazy(
+display_name.help_text = ugettext(
 'Optional field used as a display name, such as for awards '
 'certificates. Should be the entire display name in the format '
 'the person would like it displayed (could be family name followed '
 'by given name in some cultures, for example). Display names can be '
 'any valid UTF-8 text.')
 #: Required field used as the 'public' contact mechanism for the
 #: Role (as opposed to the user.account email address which is
 #: kept secret).
 email = db.EmailProperty(
 required=True,
-verbose_name=ugettext_lazy('Email Address'))
+verbose_name=ugettext('Email Address'))
 #: Optional field storing Instant Messaging network; displayed publicly.
 im_network = db.StringProperty(
-verbose_name=ugettext_lazy('IM Network'))
+verbose_name=ugettext('IM Network'))
-im_network.help_text = ugettext_lazy(
+im_network.help_text = ugettext(
 'examples: irc:irc.freenode.org xmpp:gmail.com/Home')
 #: Optional field storing Instant Messaging handle; displayed publicly.
 im_handle = db.StringProperty(
-verbose_name=ugettext_lazy('IM Handle'))
+verbose_name=ugettext('IM Handle'))
-im_handle.help_text = ugettext_lazy(
+im_handle.help_text = ugettext(
 'personal identifier, such as: screen name, IRC nick, user name')
 #: Optional field storing a home page URL; displayed publicly.
 home_page = db.LinkProperty(
-verbose_name=ugettext_lazy('Home Page URL'))
+verbose_name=ugettext('Home Page URL'))
 #: Optional field storing a blog URL; displayed publicly.
 blog = db.LinkProperty(
-verbose_name=ugettext_lazy('Blog URL'))
+verbose_name=ugettext('Blog URL'))
 #: Optional field storing a URL to an image, expected to be a
 #: personal photo (or cartoon avatar, perhaps); displayed publicly.
 photo_url = db.LinkProperty(
-verbose_name=ugettext_lazy('Thumbnail Photo URL'))
+verbose_name=ugettext('Thumbnail Photo URL'))
-photo_url.help_text = ugettext_lazy(
+photo_url.help_text = ugettext(
 'URL of 64x64 pixel thumbnail image')
 #: Optional field storing the latitude provided by the Role; displayed
 #: publicly.
 latitude = db.FloatProperty(
-verbose_name=ugettext_lazy('Latitude'))
+verbose_name=ugettext('Latitude'))
-latitude.help_text = ugettext_lazy(
+latitude.help_text = ugettext(
 'decimal degrees northerly (N), use minus sign (-) for southerly (S)')
 #: Optional field storing the longitude provided by the Role; displayed
 #: publicly.
 longitude = db.FloatProperty(
-verbose_name=ugettext_lazy('Longitude'))
+verbose_name=ugettext('Longitude'))
-longitude.help_text = ugettext_lazy(
+longitude.help_text = ugettext(
 'decimal degrees easterly (E), use minus sign (-) for westerly (W)')
 #====================================================================
 # (private) contact information
 #====================================================================
 #: Required field containing residence street address; kept private.
 #: Residence street address can only be lower ASCII, not UTF-8 text, because
 #: it may be used as a shipping address.
 res_street = db.StringProperty(required=True,
-verbose_name=ugettext_lazy('Street address'))
+verbose_name=ugettext('Street address'))
-res_street.help_text = ugettext_lazy(
+res_street.help_text = ugettext(
 'street number and name, lower ASCII characters only')
 #: Required field containing residence address city; kept private.
 #: Residence city can only be lower ASCII, not UTF-8 text, because it
 #: may be used as a shipping address.
 res_city = db.StringProperty(required=True,
-verbose_name=ugettext_lazy('City'))
+verbose_name=ugettext('City'))
-res_city.help_text = ugettext_lazy('lower ASCII characters only')
+res_city.help_text = ugettext('lower ASCII characters only')
 #: Optional field containing residence address state or province; kept
 #: private.  Residence state/province can only be lower ASCII, not UTF-8
 #: text, because it may be used as a shipping address.
 res_state = db.StringProperty(
-verbose_name=ugettext_lazy('State/Province'))
+verbose_name=ugettext('State/Province'))
-res_state.help_text = ugettext_lazy(
+res_state.help_text = ugettext(
 'optional if country/territory does not have states or provinces, '
 'lower ASCII characters only')
 #: Required field containing residence address country or territory; kept
 #: private.
 res_country = db.StringProperty(required=True,
-verbose_name=ugettext_lazy('Country/Territory'),
+verbose_name=ugettext('Country/Territory'),
 choices=countries.COUNTRIES_AND_TERRITORIES)
 #: Required field containing residence address postal code (ZIP code in
 #: the United States); kept private.  Residence postal code can only be
 #: lower ASCII, not UTF-8 text, because it may be used as a shipping address.
 res_postalcode = db.StringProperty(required=True,
-verbose_name=ugettext_lazy('ZIP/Postal Code'))
+verbose_name=ugettext('ZIP/Postal Code'))
-res_postalcode.help_text = ugettext_lazy('lower ASCII characters only')
+res_postalcode.help_text = ugettext('lower ASCII characters only')
 #: Optional field containing a separate shipping street address; kept
 #: private.  If shipping address is not present in its entirety, the
 #: residence address will be used instead.  Shipping street address can only
 #: be lower ASCII, not UTF-8 text, because, if supplied, it is used as a
 #: shipping address.
 ship_street = db.StringProperty(
-verbose_name=ugettext_lazy('Shipping Street address'))
+verbose_name=ugettext('Shipping Street address'))
-ship_street.help_text = ugettext_lazy(
+ship_street.help_text = ugettext(
 'street number and name, lower ASCII characters only')
 #: Optional field containing shipping address city; kept private.
 #: Shipping city can only be lower ASCII, not UTF-8 text, because, if
 #: supplied, it is used as a shipping address.
 ship_city = db.StringProperty(
-verbose_name=ugettext_lazy('Shipping City'))
+verbose_name=ugettext('Shipping City'))
-ship_city.help_text = ugettext_lazy('lower ASCII characters only')
+ship_city.help_text = ugettext('lower ASCII characters only')
 #: Optional field containing shipping address state or province; kept
 #: private.  Shipping state/province can only be lower ASCII, not UTF-8
 #: text, because, if supplied, it is used as a shipping address.
 ship_state = db.StringProperty(
-verbose_name=ugettext_lazy('Shipping State/Province'))
+verbose_name=ugettext('Shipping State/Province'))
-ship_state.help_text = ugettext_lazy(
+ship_state.help_text = ugettext(
 'optional if country/territory does not have states or provinces, '
 'lower ASCII characters only')
 #: Optional field containing shipping address country or territory; kept
 #: private.
 ship_country = db.StringProperty(
-verbose_name=ugettext_lazy('Shipping Country/Territory'),
+verbose_name=ugettext('Shipping Country/Territory'),
 choices=countries.COUNTRIES_AND_TERRITORIES)
 #: Optional field containing shipping address postal code (ZIP code in
 #: the United States); kept private.  Shipping postal code can only be
 #: lower ASCII, not UTF-8 text, because, if supplied, it is used as a
 #: shipping address.
 ship_postalcode = db.StringProperty(
-verbose_name=ugettext_lazy('Shipping ZIP/Postal Code'))
+verbose_name=ugettext('Shipping ZIP/Postal Code'))
-ship_postalcode.help_text = ugettext_lazy('lower ASCII characters only')
+ship_postalcode.help_text = ugettext('lower ASCII characters only')
 #: Required field containing a phone number that will be supplied
 #: to shippers; kept private.
 phone = db.PhoneNumberProperty(
 required=True,
-verbose_name=ugettext_lazy('Phone Number'))
+verbose_name=ugettext('Phone Number'))
-phone.help_text = ugettext_lazy(
+phone.help_text = ugettext(
 'include complete international calling number with country code')
 #====================================================================
 # (private) personal information
 #====================================================================
 #: Required field containing the Role's birthdate (for
 #: determining Program participation eligibility); kept private.
 birth_date = db.DateProperty(
 required=True,
-verbose_name=ugettext_lazy('Birth Date'))
+verbose_name=ugettext('Birth Date'))
-birth_date.help_text = ugettext_lazy(
+birth_date.help_text = ugettext(
 'required for determining program eligibility')
 #: Optional field indicating choice of t-shirt, from XXS to XXXL;
 #: kept private.
 tshirt_size = db.StringProperty(
-verbose_name=ugettext_lazy('T-shirt Size'),
+verbose_name=ugettext('T-shirt Size'),
 choices=('XXS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL'))
 #: Optional field indicating choice of t-shirt fit; kept private.
 tshirt_style = db.StringProperty(
-verbose_name=ugettext_lazy('T-shirt Style'),
+verbose_name=ugettext('T-shirt Style'),
 choices=('male', 'female'))
 #: field storing whether User has agreed to the Role-specific Terms of
 #: Service. (Not a required field because some Roles may not have special
 #: Terms of Service.)
 agrees_to_tos = db.BooleanProperty(
-verbose_name=ugettext_lazy('Agrees to ToS'))
+verbose_name=ugettext('Agrees to ToS'))
-agrees_to_tos.help_text = ugettext_lazy(
+agrees_to_tos.help_text = ugettext(
 'Indicates that the user agrees to the Terms of Service for this Role.')
 #: field storing the state of this role
 #: Active means that this role can exercise all it's privileges.
 #: Invalid mean that this role cannot exercise it's privileges.
 #: privileges but should be able to see the data. For instance when a program
 #: has been marked inactive an Organization Admin should still be able to see
 #: the student applications.
 state = db.StringProperty(default='active',
 choices=['active','invalid','inactive'],
-verbose_name=ugettext_lazy('State of this Role'))
+verbose_name=ugettext('State of this Role'))
-state.help_text = ugettext_lazy(
+state.help_text = ugettext(
 'Indicates the state of the role concerning which privileges may be used')
 def name(self):
 """Alias 'display_name' Property as 'name' for use in common templates.

changeset 970	8b5611d5b053
parent 913	db38e7680d1c
child 1046	7e10c0654dfb