aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/pyAggr3g470r.py8
-rw-r--r--source/templates/languages.html11
2 files changed, 11 insertions, 8 deletions
diff --git a/source/pyAggr3g470r.py b/source/pyAggr3g470r.py
index 62e117b7..d61d4e73 100755
--- a/source/pyAggr3g470r.py
+++ b/source/pyAggr3g470r.py
@@ -468,11 +468,11 @@ class pyAggr3g470r(object):
language = guess_language(utils.clear_string(article["article_content"]))
if language not in result.keys():
result[language] = {}
- if feed["feed_title"] not in result[language].keys():
- result[language][feed["feed_title"]] = []
- result[language][feed["feed_title"]].append(article)
+ if feed["feed_id"] not in result[language].keys():
+ result[language][feed["feed_id"]] = []
+ result[language][feed["feed_id"]].append(article)
tmpl = lookup.get_template("languages.html")
- return tmpl.render(articles_sorted_by_languages=result)
+ return tmpl.render(articles_sorted_by_languages=result, mongo=self.mongo)
languages.exposed = True
diff --git a/source/templates/languages.html b/source/templates/languages.html
index 8d0ff3ce..46266e98 100644
--- a/source/templates/languages.html
+++ b/source/templates/languages.html
@@ -8,10 +8,13 @@
</ul>
%for language in articles_sorted_by_languages.keys():
<h1>${language}</h1>
- %for feed in articles_sorted_by_languages[language]:
- <h2>${feed}</h2>
- %for article in articles_sorted_by_languages[language][feed]:
- ${article["article_date"].strftime('%Y-%m-%d %H:%M')} - <a href="/article/${feed}:${article['article_id']}" rel="noreferrer" target="_blank">${article["article_title"]}</a>
+ %for feed_id in articles_sorted_by_languages[language]:
+ <%
+ feed = mongo.get_feed(feed_id)
+ %>
+ <h2>${feed["feed_title"]}</h2>
+ %for article in articles_sorted_by_languages[language][feed_id]:
+ ${article["article_date"].strftime('%Y-%m-%d %H:%M')} - <a href="/article/${feed['feed_id']}:${article['article_id']}" rel="noreferrer" target="_blank">${article["article_title"]}</a>
<br />
%endfor
<br />
bgstack15