add new date filter to stop messing with DATE_FORMAT

feedhq/feeds/models.py

@@ -773,9 +773,6 @@ def oauth_client(self, service):
                       creds['oauth_token_secret'])
         return auth
 
-    def current_year(self):
-        return self.date.year == timezone.now().year
-
 
 class Entry(BaseEntry, models.Model):
     """An entry is a cached feed item"""

feedhq/feeds/templates/feeds/entry_links.html

@@ -1 +1 @@
-<div class="date" title="{{ object.date|date:"c" }}">{% if object.current_year %}{{ object.date|timezone:user.timezone|date }}{% else %}{{ object.date|timezone:user.timezone|date:"DATE_FORMAT" }}{% endif %} - <a{% if object.feed.favicon %} style="background-image: url('{{ object.feed.favicon.url }}'); padding-left: 20px;"{% endif %} href="{{ object.link }}">{{ object.link_domain }}</a>{% if object.read_later_url %} - <a href="{{ object.read_later_url }}">{{ object.read_later_domain }}</a>{% endif %}</div>
+{% load feeds_tags %}<div class="date" title="{{ object.date|date:"c" }}">{{ object.date|timezone:user.timezone|smart_datetime }} - <a{% if object.feed.favicon %} style="background-image: url('{{ object.feed.favicon.url }}'); padding-left: 20px;"{% endif %} href="{{ object.link }}">{{ object.link_domain }}</a>{% if object.read_later_url %} - <a href="{{ object.read_later_url }}">{{ object.read_later_domain }}</a>{% endif %}</div>

feedhq/feeds/templatetags/feeds_tags.py

@@ -12,3 +12,11 @@ def smart_date(value):
             return value.strftime('%H:%M')
         return value.strftime('%b %d')
     return value.strftime('%b %d, %Y')
+
+
+@register.filter
+def smart_datetime(value):
+    now = timezone.localtime(timezone.now(), value.tzinfo)
+    if value.year == now.year:
+        return value.strftime('%b %d, %H:%M')
+    return value.strftime('%b %d, %Y')

feedhq/settings.py

@@ -269,8 +269,6 @@ def parse_redis_url():
 LOGIN_URL = reverse_lazy('login')
 LOGIN_REDIRECT_URL = reverse_lazy('feeds:entries')
 
-DATE_FORMAT = 'M j, H:i'
-
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,