Fix outstanding issues with Django-4

- Version comparison
- Issue with FilterExpressions

Author: Konstantinos Bairaktaris

transifex/native/django/templatetags/transifex.py

@@ -259,15 +259,24 @@ def render(self, context):
         # it back in place before returning from render.
         # https://docs.djangoproject.com/en/1.11/howto/custom-template-tags/#thread-safety-considerations  # noqa
         old_source_string_var = self.source_string.var
+        try:
+            old_is_var = self.source_string.is_var
+        except AttributeError:
+            old_is_var = None
 
         # Now we resolve the full source filter expression, after having
         # replaced its text with the outcome of the translation, in order to
         # apply the expression's filters to the translation. The translation is
         # marked as safe in order to prevent further escaping attempts that
         # would introduce the danger of double escaping (eg `<` => `&amp;lt;`)
         self.source_string.var = mark_safe(result)
+        self.source_string.is_var = False
+
         result = self.source_string.resolve(context)
+
         self.source_string.var = old_source_string_var
+        if old_is_var is not None:
+            self.source_string.is_var = old_is_var
 
         if self.asvar is not None:
             # Save the translation outcome to a context variable

transifex/native/django/tools/migrations/templatetags.py

@@ -58,7 +58,8 @@ def _get_ordered_tokens(parser):
     This method is useful when we want to iterate all the remaining
     tokens of the parser in the correct order.
     """
-    if DJANGO_VERSION[0] >= 3 and DJANGO_VERSION[1] > 1:
+    major, minor = DJANGO_VERSION[:2]
+    if major == 3 and minor > 1 or major > 3:
         return reversed(parser.tokens)
     return parser.tokens