Commits

Matthew Schinckel  committed 0fb7cdf Merge
  • Participants
  • Parent commits b96a900, b38f852

Comments (0)

Files changed (1)

File public_holidays/models.py

 from django.db import models
 import django_countries
-import jsonfield.fields
+import jsonfield
 
 class PublicHoliday(models.Model):
     """
     localflavor module.
     
     This is a seperate app, that relies on django-countries, with my
-    province patches applied, and django-json-field.
+    province patches applied, and django-jsonfield.
     """
     
     #: Every PublicHoliday must have a name.
     country = django_countries.CountryField()
     #: Each PublicHoliday can apply to all, or a subset of provinces in
     #: a country.
-    provinces = jsonfield.fields.JSONField(null=True, blank=True)
+    provinces = jsonfield.JSONField(null=True, blank=True)
     
     
     class Meta:
         app_label = 'public_holidays'
+        verbose_name = u'public holiday'
+        verbose_name_plural = u'public holidays'
         ordering = ('date', 'country')
         unique_together = (
             ('name', 'date', 'country'),