Rework i18n pattern handling and bump version

Author: jacklinke

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-tomselect"
-version = "2025.7.1"
+version = "2025.9.1"
 description = "Django autocomplete widgets and views using Tom Select"
 authors = [{ name = "Jack Linke", email = "[email protected]" }]
 license = "MIT"

src/django_tomselect/utils.py

@@ -5,9 +5,8 @@
 
 from django.conf import settings
 from django.urls import NoReverseMatch, reverse
-from django.urls.base import reverse_lazy
+from django.utils import translation
 from django.utils.html import escape
-from django.utils.translation import get_language
 
 from django_tomselect.logging import package_logger
 
@@ -22,48 +21,47 @@
 
 def safe_reverse(viewname: str, args: list | None = None, kwargs: dict | None = None) -> str:
     """Safely reverse url, handling i18n edge cases when USE_I18N is True but i18n URL patterns aren't included."""
+    # Store the current language
+    current_language = translation.get_language()
+
     try:
-        # First try normal reversal
-        return reverse(viewname, args=args, kwargs=kwargs)
-    except NoReverseMatch as e:
-        # Check if this might be an i18n-related issue
-        if settings.USE_I18N and get_language():
-            # Try to extract the actual error message
-            error_msg = str(e)
-            language_code = get_language()
-
-            # Check if the error is about a language namespace
-            if f"'{language_code}' is not a registered namespace" in error_msg:
-                package_logger.debug(
-                    "URL reversal failed due to missing i18n namespace '%s'. "
-                    "This usually means django.conf.urls.i18n is not included in urlpatterns. "
-                    "Attempting fallback URL reversal.",
-                    language_code,
-                )
-
-                # Try to reverse without language prefix by temporarily deactivating translations
-                from django.utils import translation
-
-                current_language = translation.get_language()
-                try:
-                    # Deactivate translations temporarily
+        # If i18n is enabled but there's a problem with url reversal, temporarily deactivate
+        # translations to avoid issues with missing i18n URL patterns.
+        if settings.USE_I18N and current_language:
+            # First, try with language activated
+            try:
+                return reverse(viewname, args=args, kwargs=kwargs)
+            except NoReverseMatch as e:
+                error_msg = str(e)
+                # Check if the error is about a language namespace
+                if f"'{current_language}' is not a registered namespace" in error_msg:
+                    package_logger.debug(
+                        "URL reversal failed due to missing i18n namespace '%s'. "
+                        "This usually means django.conf.urls.i18n is not included in urlpatterns. "
+                        "Attempting fallback URL reversal without language activation.",
+                        current_language,
+                    )
+                    # Deactivate translations and try again
                     translation.deactivate()
-                    return reverse(viewname, args=args, kwargs=kwargs)
-                except NoReverseMatch:
-                    # If it still fails, re-raise the original error
-                    raise e
-                finally:
-                    # Restore the original language
-                    if current_language:
-                        translation.activate(current_language)
-
-        # If not i18n related or fallback didn't work, re-raise
+                    try:
+                        return reverse(viewname, args=args, kwargs=kwargs)
+                    finally:
+                        # Always restore the original language
+                        if current_language:
+                            translation.activate(current_language)
+                else:
+                    # Different error, re-raise
+                    raise
+        else:
+            # No i18n or no language activated, use regular reversal
+            return reverse(viewname, args=args, kwargs=kwargs)
+    except Exception as e:
+        package_logger.error("Failed to reverse URL %s: %s", viewname, e)
         raise
 
 
 def safe_reverse_lazy(viewname: str, args: list | None = None, kwargs: dict | None = None):
-    """
-    Lazy version of safe_reverse that handles i18n edge cases.
+    """Lazy version of safe_reverse that handles i18n edge cases.
 
     Returns a lazy object that won't be evaluated until it's used as a string.
     """