From c7088c4462ed443ec18002122846f28847432dbc Mon Sep 17 00:00:00 2001
From: Luis Alvergue <luis@compiler.la>
Date: Thu, 20 Jun 2024 16:50:14 +0000
Subject: [PATCH] fix(enrollment): fix changing languages on enrollment success

---
 benefits/core/templates/core/includes/lang-selector.html | 1 +
 benefits/enrollment/views.py                             | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/benefits/core/templates/core/includes/lang-selector.html b/benefits/core/templates/core/includes/lang-selector.html
index b652d2e397..82fc08b074 100644
--- a/benefits/core/templates/core/includes/lang-selector.html
+++ b/benefits/core/templates/core/includes/lang-selector.html
@@ -14,6 +14,7 @@
     <form method="post" action="{% url "set_language" %}">
       {% csrf_token %}
       {% get_language_info for code as langinfo %}
+      <input name="next" type="hidden" value="{{ redirect_to }}" />
       <input name="language" type="hidden" value="{{ code }}" />
       <button class="btn btn-lg btn-outline-light" type="submit">{{ langinfo.name_local | capfirst }}</button>
     </form>
diff --git a/benefits/enrollment/views.py b/benefits/enrollment/views.py
index f953086468..77a0a7a711 100644
--- a/benefits/enrollment/views.py
+++ b/benefits/enrollment/views.py
@@ -289,4 +289,5 @@ def success(request):
         session.update(request, origin=reverse(ROUTE_LOGGED_OUT))
 
     analytics.returned_success(request, eligibility.group_id)
-    return TemplateResponse(request, eligibility.enrollment_success_template)
+    context = {"redirect_to": request.path}
+    return TemplateResponse(request, eligibility.enrollment_success_template, context)