The solution is very simple. We need to strip the locale part of the URI
when setting the next query parameter.
{{{
def strip_language_from_path(path):
"""
Strips the language-code if there is a valid language-code
found in the `path`.
"""
regex_match = language_code_prefix_re.match(path)
if not regex_match:
return None
path = regex_match.group(2)
return path
def user_passes_test(test_func, login_url=None,
redirect_field_name=REDIRECT_FIELD_NAME):
"""
Decorator for views that checks that the user passes the given test,
redirecting to the log-in page if necessary. The test should be a
callable
that takes the user object and returns True if the user passes.
"""
def decorator(view_func):
@wraps(view_func, assigned=available_attrs(view_func))
def _wrapped_view(request, *args, **kwargs):
if test_func(request.user):
return view_func(request, *args, **kwargs)
path = request.build_absolute_uri()
# urlparse chokes on lazy objects in Python 3, force to str
resolved_login_url = force_str(
resolve_url(login_url or settings.LOGIN_URL))
# If the login url is the same scheme and net location then
just
# use the path as the "next" url.
login_scheme, login_netloc = urlparse(resolved_login_url)[:2]
current_scheme, current_netloc = urlparse(path)[:2]
if ((not login_scheme or login_scheme == current_scheme) and
(not login_netloc or login_netloc == current_netloc)):
path = request.get_full_path()
path = strip_language_from_path(path)
from django.contrib.auth.views import redirect_to_login
return redirect_to_login(
path, resolved_login_url, redirect_field_name)
return _wrapped_view
return decorator
}}}
I can issue a PR with this change if desired.
If not, is there another way to fix this problem?
--
Ticket URL: <https://code.djangoproject.com/ticket/24085>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.
* needs_better_patch: => 0
* needs_docs: => 0
* needs_tests: => 0
--
Ticket URL: <https://code.djangoproject.com/ticket/24085#comment:1>
Comment (by claudep):
Could you test if setting your `LOGIN_URL` setting to
`reverse_lazy('login')` helps with this issue?
--
Ticket URL: <https://code.djangoproject.com/ticket/24085#comment:2>
* status: new => closed
* resolution: => needsinfo
Comment:
Please reopen if Claude's suggestion doesn't work.
--
Ticket URL: <https://code.djangoproject.com/ticket/24085#comment:3>