Merge branch 'kgodey'

* kgodey:
  Fixing a double declaration of the monthname filter, and renaming ap_monthname to apmonthname (matches apnumber from django.contrib.humanize).
  Added templatetags "monthname" and "ap_monthname" to Penfield, which turn month numbers into month names.

diff --git a/contrib/penfield/templatetags/__init__.py b/contrib/penfield/templatetags/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/contrib/penfield/templatetags/penfield.py b/contrib/penfield/templatetags/penfield.py
new file mode 100644 (file)
index 0000000..99e358c
--- /dev/null
+++ b/contrib/penfield/templatetags/penfield.py
@@ -0,0 +1,22 @@
+from django import template
+from django.utils.dates import MONTHS, MONTHS_AP
+
+register = template.Library()
+
+def monthname(value):
+       monthnum = int(value)
+       if 1 <= monthnum <= 12:
+               return MONTHS[monthnum]
+       else:
+               return value
+
+register.filter('monthname', monthname)
+
+def apmonthname(value):
+       monthnum = int(value)
+       if 1 <= monthnum <= 12:
+               return MONTHS_AP[monthnum]
+       else:
+               return value
+
+register.filter('apmonthname', apmonthname)