support switching to non-English community forums

Author: escattone

kitsune/questions/jinja2/questions/includes/aaq_macros.html

@@ -225,9 +225,16 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
         {{ _('You can also post your question directly to our support team for assistance.') }}
       {% endif %}
     </p>
-    <a href="{{ url('questions.aaq_step3', product_slug=current_product.slug) | urlparams(support_type=switch_to_type, next=next_url) }}" class="sumo-button secondary-button">
-      {{ _('Continue') }}
-    </a>
+    <div class="switcher-actions">
+      <a href="{{ url('questions.aaq_step3', product_slug=current_product.slug) | urlparams(support_type=switch_to_type, next=next_url) }}" class="sumo-button secondary-button">
+        {{ _('Continue') }}
+      </a>
+      {% if localized_forum_link %}
+      <a href="{{ url('questions.aaq_step3', product_slug=current_product.slug, locale=localized_forum_link.locale) | urlparams(support_type=switch_to_type, next=next_url) }}">
+        {{ localized_forum_link.text }}
+      </a>
+      {% endif %}
+    </div>
   </div>
 {%- endmacro %}
 

kitsune/questions/tests/test_views.py

@@ -7,7 +7,12 @@
 
 from kitsune.flagit.models import FlaggedObject
 from kitsune.products.models import ProductSupportConfig
-from kitsune.products.tests import ProductFactory, ProductSupportConfigFactory, TopicFactory
+from kitsune.products.tests import (
+    ProductFactory,
+    ProductSupportConfigFactory,
+    TopicFactory,
+    ZendeskConfigFactory,
+)
 from kitsune.questions.models import (
     AAQConfig,
     Answer,
@@ -43,7 +48,7 @@ def test_ratelimit(self):
             product=p,
             forum_config=aaq_config,
             is_active=True,
-            default_support_type=ProductSupportConfig.SUPPORT_TYPE_FORUM
+            default_support_type=ProductSupportConfig.SUPPORT_TYPE_FORUM,
         )
         topic = TopicFactory(slug="troubleshooting", products=[p], in_aaq=True)
         data = {
@@ -99,7 +104,7 @@ def setUp(self):
             product=product,
             forum_config=aaq_config,
             is_active=True,
-            default_support_type=ProductSupportConfig.SUPPORT_TYPE_FORUM
+            default_support_type=ProductSupportConfig.SUPPORT_TYPE_FORUM,
         )
 
     def test_non_authenticated_user(self):
@@ -138,6 +143,68 @@ def test_authenticated_user(self):
         assert template_used(response, "questions/new_question.html")
 
 
+class AAQZendeskRedirectLocaleTests(TestCase):
+    """Tests that the Zendesk redirect preserves the original locale for the community switcher."""
+
+    def setUp(self):
+        self.product = ProductFactory(title="Firefox", slug="firefox")
+        en_locale, _ = QuestionLocale.objects.get_or_create(locale="en-US")
+        fr_locale, _ = QuestionLocale.objects.get_or_create(locale="fr")
+        aaq_config = AAQConfigFactory(
+            product=self.product,
+            enabled_locales=[en_locale, fr_locale],
+            is_active=True,
+        )
+        ProductSupportConfigFactory(
+            product=self.product,
+            forum_config=aaq_config,
+            zendesk_config=ZendeskConfigFactory(),
+            is_active=True,
+            default_support_type=ProductSupportConfig.SUPPORT_TYPE_ZENDESK,
+        )
+        self.user = UserFactory(is_superuser=False)
+        self.client.login(username=self.user.username, password="testpass")
+
+    def test_zendesk_redirect_includes_from_locale(self):
+        """When a non-English user hits the Zendesk form, the redirect includes from_locale."""
+        url = reverse("questions.aaq_step3", locale="fr", args=["firefox"])
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 302)
+        self.assertIn("from_locale=fr", response["Location"])
+
+    def test_localized_forum_link_set_when_forum_enabled(self):
+        """When from_locale differs from current locale and the forum supports it,
+        a localized forum link appears in the switcher widget."""
+        url = reverse("questions.aaq_step3", locale="en-US", args=["firefox"])
+        response = self.client.get(url, {"from_locale": "fr"})
+        self.assertEqual(response.status_code, 200)
+        doc = pq(response.content)
+        # The widget is rendered twice (sidebar + inline), so expect 2 links.
+        links = doc(".switcher-actions a:not(.sumo-button)")
+        self.assertEqual(len(links), 2)
+        for link in links.items():
+            self.assertIn("/fr/questions/new/firefox/form", link.attr("href"))
+            self.assertIn(settings.LANGUAGES_DICT["fr"], link.text())
+
+    def test_no_localized_forum_link_without_from_locale(self):
+        """When from_locale is absent, no localized forum link appears."""
+        url = reverse("questions.aaq_step3", locale="en-US", args=["firefox"])
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        doc = pq(response.content)
+        links = doc(".switcher-actions a:not(.sumo-button)")
+        self.assertEqual(len(links), 0)
+
+    def test_no_localized_forum_link_for_unsupported_locale(self):
+        """When from_locale is a locale the forum doesn't support, no localized link appears."""
+        url = reverse("questions.aaq_step3", locale="en-US", args=["firefox"])
+        response = self.client.get(url, {"from_locale": "de"})
+        self.assertEqual(response.status_code, 200)
+        doc = pq(response.content)
+        links = doc(".switcher-actions a:not(.sumo-button)")
+        self.assertEqual(len(links), 0)
+
+
 class TestQuestionUpdates(TestCase):
     """Tests that questions are only updated in the right cases."""
 

kitsune/questions/views.py

@@ -26,7 +26,7 @@
 )
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
-from django.utils import timezone
+from django.utils import timezone, translation
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy as _lazy
 from django.views.decorators.http import require_GET, require_http_methods, require_POST
@@ -681,15 +681,29 @@ def aaq(request, product_slug=None, step=1, is_loginless=False):
 
             messages.add_message(request, messages.WARNING, msg)
 
+            params = request.GET.copy()
+            params["from_locale"] = request.LANGUAGE_CODE
             return HttpResponseRedirect(
                 reverse(
                     "questions.aaq_step3",
                     locale=settings.WIKI_DEFAULT_LANGUAGE,
                     args=[product.slug],
                 )
-                + (f"?{request.GET.urlencode()}" if request.GET else "")
+                + f"?{params.urlencode()}"
             )
 
+        if (
+            (from_locale := request.GET.get("from_locale"))
+            and from_locale != request.LANGUAGE_CODE
+            and product.questions_enabled(locale=from_locale)
+        ):
+            language = settings.LANGUAGES_DICT[from_locale.lower()]
+            with translation.override(from_locale):
+                context["localized_forum_link"] = {
+                    "locale": from_locale,
+                    "text": _("Continue in {language}").format(language=language),
+                }
+
         context["next_url"] = next_url = get_next_url(request)
 
         context["cancel_url"] = next_url or (

kitsune/sumo/static/sumo/scss/layout/_aaq.scss

@@ -153,8 +153,13 @@ aside .aaq-widget {
     color: var(--color-text);
   }
 
-  // Continue button - centered but not stretched
-  text-align: center;
+  // Actions area with button and optional localized link
+  .switcher-actions {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: p.$spacing-lg;
+  }
 
   // Reduced motion support
   @media (prefers-reduced-motion: reduce) {