diff --git a/fgs/generator.py b/fgs/generator.py index 5967df567a17ad5b2f6f0246d120897108759bb5..205ab12ddb5e9c4b4870e11e41f44debc89d8bc4 100644 --- a/fgs/generator.py +++ b/fgs/generator.py @@ -71,9 +71,11 @@ class Generator: relevant_pages_tuple.append((page.relevance['prio'], page)) relevant_pages_tuple.sort(key=lambda x: x[0]) relevant_pages_tuple.reverse() - relevant_pages = [] + relevant_pages = {} for prio, page in relevant_pages_tuple: - relevant_pages.append(page) + if page.lang not in relevant_pages: + relevant_pages[page.lang] = [] + relevant_pages[page.lang].append(page) self.context['relevant_pages'] = relevant_pages self.context['relevant_pages_tuple'] = relevant_pages_tuple diff --git a/theme/templates/macros/renderers.html b/theme/templates/macros/renderers.html index a681666c0f0386bb5796afd610f8049c16f9c8ed..ef35addaf43bb0e453521703677f254f4639312f 100644 --- a/theme/templates/macros/renderers.html +++ b/theme/templates/macros/renderers.html @@ -3,11 +3,11 @@ {%- import 'macros/content_renderer.html' as content_renderer with context -%} {%- macro section_news(s, lang) -%} - {{ cards.cards_from_pages(pages_modified, max=s.num|d(None)) }} + {{ cards.cards_from_pages(pages_modified[lang], max=s.num|d(None)) }} {%- endmacro -%} {%- macro section_relevant(s, lang) -%} - {{ cards.cards_from_pages(relevant_pages, max=s.num|d(None)) }} + {{ cards.cards_from_pages(relevant_pages[lang], max=s.num|d(None)) }} {%- endmacro -%} {%- macro section_custom(s, lang) -%}