Address RemovedInDjango40Warning

django.utils.translation.ugettext(), ugettext_lazy(), ugettext_noop(),
ungettext(), and ungettext_lazy() are deprecated in favor of the
functions that they’re aliases for: django.utils.translation.gettext(),
gettext_lazy(), gettext_noop(), ngettext(), and ngettext_lazy().
For more info. please refer [1].

https://docs.djangoproject.com/en/4.0/releases/3.0/#id3

[1] https://review.opendev.org/c/openstack/horizon/+/827092

Change-Id: Idea2712e701488575c3f418f11ecae12516fdc68

tacker_horizon/openstack_dashboard/api/tacker.py

@@ -13,7 +13,7 @@
 # under the License.
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from oslo_log import log as logging
 from oslo_utils import strutils
 from tackerclient.v1_0 import client as tacker_client

tacker_horizon/openstack_dashboard/dashboards/nfv/dashboard.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/forms.py

@@ -11,7 +11,7 @@
 # under the License.
 
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/panel.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from tacker_horizon.openstack_dashboard.dashboards.nfv import dashboard

tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tables.py

@@ -11,8 +11,8 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import tables
 
@@ -27,7 +27,7 @@ class MyFilterAction(tables.FilterAction):
 class DeleteNSD(policy.PolicyTargetMixin, tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete NS",
             "Delete NSs",
             count
@@ -35,7 +35,7 @@ class DeleteNSD(policy.PolicyTargetMixin, tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete NS",
             "Delete NSs",
             count

tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tabs.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import tabs

tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/views.py

@@ -13,7 +13,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/forms.py

@@ -11,7 +11,7 @@
 # under the License.
 
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from oslo_log import log as logging
 
 from horizon import exceptions

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/panel.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from tacker_horizon.openstack_dashboard.dashboards.nfv import dashboard

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tables.py

@@ -12,8 +12,8 @@
 
 
 from django.http import Http404
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import messages
 from horizon import tables
@@ -108,7 +108,7 @@ class NSUpdateRow(tables.Row):
 class DeleteNS(policy.PolicyTargetMixin, tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Terminate NS",
             "Terminate NSs",
             count
@@ -116,7 +116,7 @@ class DeleteNS(policy.PolicyTargetMixin, tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Terminate NS",
             "Terminate NSs",
             count

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tabs.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from horizon import exceptions
 from horizon import tabs
 from horizon import utils as horizon_utils

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/views.py

@@ -12,7 +12,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from oslo_log import log as logging
 
 from horizon import exceptions

tacker_horizon/openstack_dashboard/dashboards/nfv/utils.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import tables
 

tacker_horizon/openstack_dashboard/dashboards/nfv/vim/forms.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.debug import sensitive_variables
 
 from horizon import exceptions

tacker_horizon/openstack_dashboard/dashboards/nfv/vim/panel.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from tacker_horizon.openstack_dashboard.dashboards.nfv import dashboard

tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tables.py

@@ -13,8 +13,8 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import tables
 
@@ -29,7 +29,7 @@ class MyFilterAction(tables.FilterAction):
 class DeleteVIMLink(policy.PolicyTargetMixin, tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete VIM",
             "Delete VIMs",
             count
@@ -37,7 +37,7 @@ class DeleteVIMLink(policy.PolicyTargetMixin, tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete VIM",
             "Delete VIMs",
             count

tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tabs.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import tabs

tacker_horizon/openstack_dashboard/dashboards/nfv/vim/views.py

@@ -15,7 +15,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/forms.py

@@ -13,7 +13,7 @@
 # under the License.
 
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import yaml
 
 from horizon import exceptions

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/panel.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from tacker_horizon.openstack_dashboard.dashboards.nfv import dashboard

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tables.py

@@ -13,8 +13,8 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import tables
 
@@ -29,7 +29,7 @@ class MyFilterAction(tables.FilterAction):
 class DeleteVNFD(policy.PolicyTargetMixin, tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete VNF",
             "Delete VNFs",
             count
@@ -37,7 +37,7 @@ class DeleteVNFD(policy.PolicyTargetMixin, tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete VNF",
             "Delete VNFs",
             count

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tabs.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import tabs

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/views.py

@@ -15,7 +15,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/forms.py

@@ -11,7 +11,7 @@
 # under the License.
 
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/panel.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from tacker_horizon.openstack_dashboard.dashboards.nfv import dashboard

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tables.py

@@ -11,8 +11,8 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import tables
 
@@ -27,7 +27,7 @@ class MyFilterAction(tables.FilterAction):
 class DeleteVNFFGD(policy.PolicyTargetMixin, tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete VNFFG",
             "Delete VNFFGs",
             count
@@ -35,7 +35,7 @@ class DeleteVNFFGD(policy.PolicyTargetMixin, tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Delete VNFFG",
             "Delete VNFFGs",
             count

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tabs.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import yaml
 
 from horizon import exceptions

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/views.py

@@ -13,7 +13,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/forms.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from oslo_log import log as logging
 
 from horizon import exceptions

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/panel.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from tacker_horizon.openstack_dashboard.dashboards.nfv import dashboard

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tables.py

@@ -12,9 +12,9 @@
 
 
 from django.http import Http404
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
 
 from horizon import messages
 from horizon import tables
@@ -97,7 +97,7 @@ class VNFFGUpdateRow(tables.Row):
 class DeleteVNFFG(policy.PolicyTargetMixin, tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Terminate VNFFG",
             "Terminate VNFFGs",
             count
@@ -105,7 +105,7 @@ class DeleteVNFFG(policy.PolicyTargetMixin, tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Terminate VNFFG",
             "Terminate VNFFGs",
             count

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tabs.py

@@ -11,7 +11,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from horizon import exceptions
 from horizon import tabs
 from horizon import utils as horizon_utils

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/views.py

@@ -12,7 +12,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/forms.py

@@ -15,7 +15,7 @@
 import yaml
 
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from oslo_log import log as logging
 
 from horizon import exceptions

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/panel.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from tacker_horizon.openstack_dashboard.dashboards.nfv import dashboard

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tables.py

@@ -14,9 +14,9 @@
 
 
 from django.http import Http404
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
 
 from horizon import messages
 from horizon import tables
@@ -142,7 +142,7 @@ class VNFUpdateRow(tables.Row):
 class DeleteVNF(policy.PolicyTargetMixin, tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Terminate VNF",
             "Terminate VNFs",
             count
@@ -150,7 +150,7 @@ class DeleteVNF(policy.PolicyTargetMixin, tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             "Terminate VNF",
             "Terminate VNFs",
             count

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tabs.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from horizon import exceptions
 from horizon import tabs
 from horizon import utils as horizon_utils

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/views.py

@@ -14,7 +14,7 @@
 
 from django.urls import reverse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 

tox.ini

@@ -79,6 +79,6 @@ max-complexity = 20
 
 [testenv:makemessages]
 commands =
-    pybabel extract -F babel-django.cfg -o tacker_horizon/locale/django.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k ugettext_noop -k ugettext_lazy -k ungettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 tacker_horizon
-    pybabel extract -F babel-djangojs.cfg -o tacker_horizon/locale/djangojs.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k ugettext_noop -k ugettext_lazy -k ungettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 tacker_horizon
+    pybabel extract -F babel-django.cfg -o tacker_horizon/locale/django.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 tacker_horizon
+    pybabel extract -F babel-djangojs.cfg -o tacker_horizon/locale/djangojs.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 tacker_horizon