From 6d2ad4a8bdd6081d7a682dbd14b5d6c0fd5daab2 Mon Sep 17 00:00:00 2001
From: Grant McConnaughey <grantmcconnaughey@gmail.com>
Date: Thu, 23 Jul 2015 10:03:04 -0500
Subject: [PATCH] Add back load url from future, will remove when 1.9 is out

---
 avatar/templates/avatar/add.html                                | 1 +
 avatar/templates/avatar/change.html                             | 1 +
 avatar/templates/avatar/confirm_delete.html                     | 1 +
 avatar/templates/notification/avatar_friend_updated/full.txt    | 2 +-
 avatar/templates/notification/avatar_friend_updated/notice.html | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/avatar/templates/avatar/add.html b/avatar/templates/avatar/add.html
index 9b4fed6..7a04b34 100644
--- a/avatar/templates/avatar/add.html
+++ b/avatar/templates/avatar/add.html
@@ -1,5 +1,6 @@
 {% extends "avatar/base.html" %}
 {% load i18n avatar_tags %}
+{% load url from future %}
 
 {% block content %}
     <p>{% trans "Your current avatar: " %}</p>
diff --git a/avatar/templates/avatar/change.html b/avatar/templates/avatar/change.html
index 8d27359..7e7b3d2 100644
--- a/avatar/templates/avatar/change.html
+++ b/avatar/templates/avatar/change.html
@@ -1,5 +1,6 @@
 {% extends "avatar/base.html" %}
 {% load i18n avatar_tags %}
+{% load url from future %}
 
 {% block content %}
     <p>{% trans "Your current avatar: " %}</p>
diff --git a/avatar/templates/avatar/confirm_delete.html b/avatar/templates/avatar/confirm_delete.html
index f81c815..373131d 100644
--- a/avatar/templates/avatar/confirm_delete.html
+++ b/avatar/templates/avatar/confirm_delete.html
@@ -1,5 +1,6 @@
 {% extends "avatar/base.html" %}
 {% load i18n %}
+{% load url from future %}
 
 {% block content %}
     <p>{% trans "Please select the avatars that you would like to delete." %}</p>
diff --git a/avatar/templates/notification/avatar_friend_updated/full.txt b/avatar/templates/notification/avatar_friend_updated/full.txt
index 9510956..d5197a6 100644
--- a/avatar/templates/notification/avatar_friend_updated/full.txt
+++ b/avatar/templates/notification/avatar_friend_updated/full.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% blocktrans with user as avatar_creator and avatar.get_absolute_url as avatar_url %}{{ avatar_creator }} has updated their avatar {{ avatar }}.
+{% load i18n %}{% load url from future %}{% blocktrans with user as avatar_creator and avatar.get_absolute_url as avatar_url %}{{ avatar_creator }} has updated their avatar {{ avatar }}.
 
 http://{{ current_site }}{{ avatar_url }}
 {% endblocktrans %}
diff --git a/avatar/templates/notification/avatar_friend_updated/notice.html b/avatar/templates/notification/avatar_friend_updated/notice.html
index 79c5d54..c2ba8bc 100644
--- a/avatar/templates/notification/avatar_friend_updated/notice.html
+++ b/avatar/templates/notification/avatar_friend_updated/notice.html
@@ -1,2 +1,2 @@
-{% load i18n %}{% url 'profile_detail' username=user.username as user_url %}{# TODO: support custom user models via get_username; actually, is this template even used anymore? #}
+{% load i18n %}{% load url from future %}{% url 'profile_detail' username=user.username as user_url %}{# TODO: support custom user models via get_username; actually, is this template even used anymore? #}
 {% blocktrans with user as avatar_creator and avatar.get_absolute_url as avatar_url %}<a href="{{ user_url }}">{{ avatar_creator }}</a> has updated their avatar <a href="{{ avatar_url }}">{{ avatar }}</a>.{% endblocktrans %}