Fix the exception path, also move app specific templates into the app folder

This commit is contained in:
2011-02-02 09:15:39 +00:00
parent bf18d43301
commit b0707c86f2
8 changed files with 34 additions and 1 deletions

View File

View File

@@ -0,0 +1,33 @@
from django import template
register = template.Library()
MOMENT = 120 # duration in seconds within which the time difference
# will be rendered as 'a moment ago'
@register.filter
def naturaltimediff(value):
"""
Finds the difference between the datetime value given and now()
and returns appropriate humanize form
"""
from datetime import datetime
if isinstance(value, datetime):
delta = datetime.now() - value
if delta.days > 6:
return value.strftime("%b %d") # May 15
if delta.days > 1:
return value.strftime("%A") # Wednesday
elif delta.days == 1:
return 'yesterday' # yesterday
elif delta.seconds > 3600:
return str(delta.seconds / 3600 ) + ' hours ago' # 3 hours ago
elif delta.seconds > MOMENT:
return str(delta.seconds/60) + ' minutes ago' # 29 minutes ago
else:
return 'a moment ago' # a moment ago
return defaultfilters.date(value)
else:
return str(value)

View File

@@ -10,7 +10,7 @@ from django.http import Http404
from django.core import serializers from django.core import serializers
from eve_proxy.models import ApiAccessLog from eve_proxy.models import ApiAccessLog
from eve_api.api_exceptions import DocumentRetrievalError from eve_proxy.exceptions import DocumentRetrievalError
from eve_api.forms import EveAPIForm from eve_api.forms import EveAPIForm
from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation
from eve_api.tasks import import_apikey_result from eve_api.tasks import import_apikey_result