Merge branch 'release/3.1.23'

azavea · May 19, 2022 · 0b3ef7d · 0b3ef7d
2 parents 9e22523 + 18525a4
commit 0b3ef7d
Show file tree

Hide file tree

Showing 22 changed files with 430 additions and 484 deletions.
diff --git a/python/cac_tripplanner/cac_tripplanner/publish_utils.py b/python/cac_tripplanner/cac_tripplanner/publish_utils.py
@@ -1,14 +1,17 @@
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 
 class PublishableMixin:
     """Helper to add Django admin actions to publish and unpublish model objects."""
-    actions = ('make_published', 'make_unpublished')
+
+    actions = ("make_published", "make_unpublished")
 
     def make_published(self, request, queryset):
         queryset.update(published=True)
-    make_published.short_description = ugettext_lazy("Publish selected %(verbose_name_plural)s")
+
+    make_published.short_description = gettext_lazy("Publish selected %(verbose_name_plural)s")
 
     def make_unpublished(self, request, queryset):
         queryset.update(published=False)
-    make_unpublished.short_description = ugettext_lazy("Unpublish selected %(verbose_name_plural)s")
+
+    make_unpublished.short_description = gettext_lazy("Unpublish selected %(verbose_name_plural)s")