Skip to content

Commit

Permalink
Better localized formatting for birthday for member details + birthda…
Browse files Browse the repository at this point in the history
…y banner on homepage
  • Loading branch information
db0company committed Sep 4, 2018
1 parent 04e23d7 commit 426ae2d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bang/magicollections.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from collections import OrderedDict
from django.conf import settings as django_settings
from django.utils.translation import ugettext_lazy as _, string_concat, get_language
from django.utils.formats import dateformat
from django.utils.formats import date_format
from django.utils.safestring import mark_safe
from django.db.models import Prefetch, Q
from django.db.models.fields import BLANK_CHOICE_DASH
Expand Down Expand Up @@ -299,7 +299,7 @@ def to_fields(self, view, item, exclude_fields=None, *args, **kwargs):
setSubField(fields, 'school', key='type', value='html')
setSubField(fields, 'school', key='value', value= u'<b>{} <span class="text-muted">({})</span></b>'.format(item.t_school, item.classroom))
setSubField(fields, 'birthday', key='type', value='text')
setSubField(fields, 'birthday', key='value', value=lambda f: dateformat.format(item.birthday, "F d"))
setSubField(fields, 'birthday', key='value', value=lambda f: date_format(item.birthday, format='MONTH_DAY_FORMAT', use_l10n=True))
setSubField(fields, 'band', key='type', value=lambda f: 'image_link')
setSubField(fields, 'band', key='link', value=lambda f: u'/members/?i_band={}'.format(item.i_band))
setSubField(fields, 'band', key='ajax_link', value=lambda f: u'/ajax/members/?i_band={}&ajax_modal_only'.format(item.i_band))
Expand Down
4 changes: 2 additions & 2 deletions bang/management/commands/generate_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.db.models import Q
from django.utils import timezone
from django.utils.translation import get_language, activate as translation_activate, ugettext_lazy as _
from django.utils.formats import dateformat
from django.utils.formats import date_format
from django.core.exceptions import ObjectDoesNotExist
from django.conf import settings as django_settings
from magi.tools import totalDonatorsThisMonth, getStaffConfigurations, latestDonationMonth
Expand Down Expand Up @@ -35,7 +35,7 @@ def generate_settings():
t_titles[lang] = u'{}, {}! {}'.format(
_('Happy Birthday'),
member.first_name,
dateformat.format(member.birthday, 'F d'),
date_format(member.birthday, format='MONTH_DAY_FORMAT', use_l10n=True),
)
translation_activate(old_lang)
latest_news.append({
Expand Down

0 comments on commit 426ae2d

Please sign in to comment.