aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoar Wandborg <joar@wandborg.se>2013-02-13 23:12:55 +0100
committerJoar Wandborg <joar@wandborg.se>2013-02-13 23:12:55 +0100
commitab9b0b4175f3d00885866a454c9fbb93a06ee155 (patch)
treea8a65ecb4e56acfc8ea6e19146a61b9dba26f94c
parent19ad2e0cd0ff2e03cdf1243a9cedaecd4a187592 (diff)
downloadmediagoblin-ab9b0b4175f3d00885866a454c9fbb93a06ee155.tar.lz
mediagoblin-ab9b0b4175f3d00885866a454c9fbb93a06ee155.tar.xz
mediagoblin-ab9b0b4175f3d00885866a454c9fbb93a06ee155.zip
Change from email format in tag URI to domain format
Also fixed a bug (thanks pyflakes)
-rw-r--r--mediagoblin/user_pages/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 8602c583..811d3578 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -205,7 +205,7 @@ def media_collect(request, media):
if existing_collection:
messages.add_message(request, messages.ERROR,
_('You already have a collection called "%s"!'
- % collection.title))
+ % existing_collection.title))
return redirect(request, "mediagoblin.user_pages.media_home",
user=request.user.username,
media=media.id)
@@ -542,7 +542,7 @@ def collection_atom_feed(request):
"MediaGoblin: Feed for %s's collection %s" %
(request.matchdict['user'], collection.title),
feed_url=request.url,
- id=u'tag:{user}@{host},{year}:collection.slug-{slug}'\
+ id=u'tag:{host},{year}:gnu-mediagoblin.{user}.collection.{slug}'\
.format(
host=request.host,
year=collection.created.strftime('%Y'),