aboutsummaryrefslogtreecommitdiff
path: root/weblog/feeds.py
diff options
context:
space:
mode:
authorYaroslav de la Peña Smirnov <contact@yaroslavps.com>2018-06-20 16:14:20 +0300
committerYaroslav de la Peña Smirnov <contact@yaroslavps.com>2018-06-20 16:14:20 +0300
commit06b58a6a3afbe3e9ffac45b363cfeafcf0e4b3f2 (patch)
tree4659c4eda47b78188f1cbff5339bbe03b31d8d5b /weblog/feeds.py
parent843e7e06709a35a162ddb28e9eef528870e2c0f6 (diff)
downloadw3blog-06b58a6a3afbe3e9ffac45b363cfeafcf0e4b3f2.tar.gz
w3blog-06b58a6a3afbe3e9ffac45b363cfeafcf0e4b3f2.zip
rss bug fixes
Diffstat (limited to 'weblog/feeds.py')
-rw-r--r--weblog/feeds.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/weblog/feeds.py b/weblog/feeds.py
index 7e567c2..158e90f 100644
--- a/weblog/feeds.py
+++ b/weblog/feeds.py
@@ -1,4 +1,4 @@
-from django.contrib.syndication.views. import Feed
+from django.contrib.syndication.views import Feed
from django.urls import reverse
from weblog.models import BlogPost, Translation, Category, CategoryTranslation
from weblog.apps import SETTINGS as blog_settings
@@ -8,15 +8,15 @@ from django.utils import translation
class BlogFeed(Feed):
def get_object(self, request, category_slug=None):
+ self.current_language = translation.get_language()
+ if self.current_language is None:
+ self.current_language = settings.LANGUAGE_CODE
if category_slug:
if category_slug != 'misc':
- self.category = Category.objects.get(slug=obj)
+ self.category = Category.objects.get(slug=category_slug)
self.category_name = self.category.name
- self.current_language = translation.get_language()
- if self.current_language is None:
- self.current_language = settings.LANGUAGE_CODE
- if IS_MULTILINGUAL and obj != 'misc':
- category_translations = CategoryTranslation.objects.filter(category=category)
+ if blog_settings['multilingual'] and category_slug != 'misc':
+ category_translations = CategoryTranslation.objects.filter(category=self.category)
if category_translations.count() > 0:
for cat_trans in category_translations:
if self.current_language[0:2] == cat_trans.language[0:2]:
@@ -46,10 +46,10 @@ class BlogFeed(Feed):
return BlogPost.objects.filter(category__slug=obj).order_by('-publish_date')[:blog_settings['posts_per_page']]
return BlogPost.objects.order_by('-publish_date')[:blog_settings['posts_per_page']]
- def item_title(self, item, obj):
+ def item_title(self, item):
translation_exists = False
post_translations = Translation.objects.filter(post=item)
- if post_translations.count() > 0 and blog_settings['multilingual']
+ if post_translations.count() > 0 and blog_settings['multilingual']:
orig_lang = item.original_language
if len(orig_lang) < 2:
orig_lang = settings.LANGUAGE_CODE[0:2]
@@ -68,10 +68,10 @@ class BlogFeed(Feed):
return item.author.get_full_name()
return None
- def item_description(self, item, obj):
+ def item_description(self, item):
translation_exists = False
post_translations = Translation.objects.filter(post=item)
- if post_translation.count() > 0 and blog_settings['multilingual']:
+ if post_translations.count() > 0 and blog_settings['multilingual']:
orig_lang = item.original_language
if len(orig_lang) < 2:
orig_lang = settings.LANGUAGE_CODE[0:2]