show correct pages in correct language

molo/core/templates/core/article_tags.html

@@ -32,7 +32,7 @@ <h3 class="base-teaser__title">
   </div>
   {% get_pages %}
   {% if pages.next %}
-    <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'tag_index' %}?page={{pages.next.number}}&tag_name={{tag.title}}">Load More</a>
+    <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'tag_index' %}?page={{pages.next.number}}&tag_name={{tag.title}}&locale={{locale_code}}">Load More</a>
   {% endif %}
 </div>
 {% endblock %}

molo/core/templates/core/article_tags_for_paging.html

@@ -30,6 +30,6 @@ <h3 class="base-teaser__title">
   </div>
   {% get_pages %}
   {% if pages.next %}
-    <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'tag_index' %}?page={{pages.next.number}}&tag_name={{tag.title}}">Load More</a>
+    <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'tag_index' %}?page={{pages.next.number}}&tag_name={{tag.title}}&locale={{locale_code}}">Load More</a>
   {% endif %}
 {% endblock %}

molo/core/templates/patterns/basics/article-teasers/latest-promoted_variations/latest-articles_for-paging.html

@@ -22,7 +22,7 @@ <h5 class="heading promoted-article__title--theme-headings">
   {% endfor %}
   {% get_pages %}
   {% if pages.next %}
-  <a class="more-link" data-next="{% url 'home_index' %}?page={{pages.next.number}}" href="{% url 'home_more' %}?page={{pages.next.number}}">More...</a>
+  <a class="more-link" data-next="{% url 'home_index' %}?page={{pages.next.number}}" href="{% url 'home_more' %}?page={{pages.next.number}}&locale={{locale_code}}">More...</a>
   {% endif %}
 
   {% block js %}

molo/core/templates/patterns/basics/sections/sectionpage-article-list-standard_for-paging.html

@@ -26,6 +26,5 @@ <h3 class="heading promoted-article__title">{{article.title}}</h3>
 </div>
 {% get_pages %}
 {% if pages.next %}
-  <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'section_index' %}?page={{pages.next.number}}&section={{section.pk}}">Load More</a>
+  <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'section_index' %}?page={{pages.next.number}}&section={{section.pk}}&locale={{locale_code}}">Load More</a>
 {% endif %}
-

molo/core/templates/search/search_results_for_paging.html

@@ -35,7 +35,7 @@ <h3>{{page.title}}</h3>
   </div>
   {% get_pages %}
   {% if pages.next %}
-    <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'search_index' %}?page={{pages.next.number}}&q={{search_query}}">Load More</a>
+    <a id="more-link" class="call-to-action call-to-action__item more-link" href="#" data-next="{% url 'search_index' %}?page={{pages.next.number}}&q={{search_query}}&locale={{locale_code}}">Load More</a>
   {% endif %}
 
   {% endif %}

molo/core/templatetags/core_tags.py

@@ -335,26 +335,43 @@ def get_articles_for_tags_with_translations(
 def get_articles_for_tag(context, tag):
     request = context['request']
     locale = context.get('locale_code')
-    main_tag = tag.specific.get_main_language_page()
-    pks = [article_tag.page.pk for article_tag in
-           ArticlePageTags.objects.filter(tag=main_tag)]
-    return get_pages(
-        context, ArticlePage.objects.descendant_of(
-            request.site.root_page).filter(pk__in=pks), locale)
+    if tag:
+        main_tag = tag.specific.get_main_language_page()
+        pks = [article_tag.page.pk for article_tag in
+               ArticlePageTags.objects.filter(tag=main_tag)]
+        return get_pages(
+            context, ArticlePage.objects.descendant_of(
+                request.site.root_page).filter(pk__in=pks), locale)
+    return None
 
 
 @register.assignment_tag(takes_context=True)
 def get_next_tag(context, tag):
+    request = context['request']
     locale_code = context.get('locale_code')
-
-    next_tag = tag.get_main_language_page().get_next_sibling()
-    if next_tag:
-        if next_tag.specific.get_translation_for(
-                locale_code, context['request'].site):
-            return next_tag.specific.get_translation_for(
-                locale_code, context['request'].site)
-        else:
-            return next_tag
+    if tag:
+        main_tag = tag.get_main_language_page()
+        if main_tag:
+            if main_tag.get_next_sibling() and \
+                    main_tag.get_next_sibling().languages.filter(
+                        language__is_main_language=True).exists():
+                next_tag = main_tag.get_next_sibling()
+                if next_tag.specific.get_translation_for(
+                        locale_code, context['request'].site):
+                    return next_tag.specific.get_translation_for(
+                        locale_code, context['request'].site)
+                else:
+                    return next_tag
+            else:
+                next_tag = Tag.objects.descendant_of(
+                    request.site.root_page).filter(
+                    languages__language__is_main_language=True).live().first()
+                if next_tag.specific.get_translation_for(
+                        locale_code, context['request'].site):
+                    return next_tag.specific.get_translation_for(
+                        locale_code, context['request'].site)
+                else:
+                    return next_tag
 
 
 @register.assignment_tag(takes_context=True)

molo/core/views.py

@@ -346,7 +346,9 @@ def section_index(
             'patterns/basics/sections/sectionpage-article-list-'
             'standard_for-paging.html')):
     section = SectionPage.objects.get(pk=request.GET.get('section'))
-    return render(request, template, {'section': section})
+    locale_code = request.GET.get('locale')
+    return render(
+        request, template, {'section': section, 'locale_code': locale_code})
 
 
 @page_template('core/article_tags_for_paging.html')
@@ -372,8 +374,9 @@ def tag_index(request, extra_context=None,
     # context = self.get_context_data(
     #     object_list=get_pages(context, articles[:count], locale))
     object_list = get_pages(context, articles, locale)
-
-    return render(request, template, {'object_list': object_list, 'tag': tag})
+    locale_code = request.GET.get('locale')
+    return render(request, template, {
+        'object_list': object_list, 'tag': tag, 'locale_code': locale_code})
 
 
 @page_template('search/search_results_for_paging.html')
@@ -383,13 +386,17 @@ def search_index(
         template=('search/search_results_for_paging.html')):
     search_query = request.GET.get('q')
     results = search(request, load_more=True)
+    locale_code = request.GET.get('locale')
     return render(
-        request, template, {'search_query': search_query, 'results': results})
+        request, template, {
+            'search_query': search_query, 'results': results,
+            'locale_code': locale_code})
 
 
 @page_template(
     'patterns/basics/article-teasers/latest-promoted_variations/late'
     'st-articles_for-feature.html')
 def home_more(
         request, template='core/main-feature-more.html', extra_context=None):
-    return render(request, template, {})
+    locale_code = request.GET.get('locale')
+    return render(request, template, {'locale_code': locale_code})