X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/66c3143bfd9b7676b3490c9fa73660fa4fff9fc3..adddbc16ded8cd4ea6a485ee4b7e9702830170ff:/apps/catalogue/templatetags/catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 90cbec3b6..d3f608ac9 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+import feedparser
+import datetime
+
 from django import template
 from django.template import Node, Variable
 from django.utils.encoding import smart_str
@@ -41,17 +44,17 @@ def capfirst(text):
 def simple_title(tags):
     mapping = {
         'author': u'Autor',
-        'theme': u'Motyw',
-        'epoch': u'Epoka',
-        'genre': u'Gatunek',
-        'kind': u'Rodzaj',
-        'set': u'Półka',
+        'theme': u'motyw',
+        'epoch': u'epoka',
+        'genre': u'gatunek',
+        'kind': u'rodzaj',
+        'set': u'półka',
     }
     
     title = []
     for tag in tags:
-        title.append("%s: %s." % (mapping[tag.category], tag.name))
-    return ' '.join(title)
+        title.append("%s: %s" % (mapping[tag.category], tag.name))
+    return capfirst(', '.join(title))
 
 
 @register.simple_tag
@@ -190,22 +193,22 @@ class CatalogueURLNode(Node):
 
 
 @register.inclusion_tag('catalogue/latest_blog_posts.html')
-def latest_blog_posts(feed_url, posts_to_show=5):
-    import feedparser
-    import datetime
-    
-    feed = feedparser.parse(feed_url)
-    posts = []
-    for i in range(posts_to_show):
-        pub_date = feed['entries'][i].updated_parsed
-        published = datetime.date(pub_date[0], pub_date[1], pub_date[2] )
-        posts.append({
-            'title': feed['entries'][i].title,
-            'summary': feed['entries'][i].summary,
-            'link': feed['entries'][i].link,
-            'date': published,
-            })
-    return {'posts': posts}
+def latest_blog_posts(feed_url, posts_to_show=5):    
+    try:
+        feed = feedparser.parse(str(feed_url))
+        posts = []
+        for i in range(posts_to_show):
+            pub_date = feed['entries'][i].updated_parsed
+            published = datetime.date(pub_date[0], pub_date[1], pub_date[2] )
+            posts.append({
+                'title': feed['entries'][i].title,
+                'summary': feed['entries'][i].summary,
+                'link': feed['entries'][i].link,
+                'date': published,
+                })
+        return {'posts': posts}
+    except:
+        return {'posts': []}
 
 
 @register.inclusion_tag('catalogue/tag_list.html')