From e976bf9765c56f1712a7469b297a87fa8ee201c1 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 23 Mar 2022 21:44:21 +0900 Subject: [PATCH] Replace deprecated ugettext_lazy and ungettext_lazy The ugettext_lazy method and the ungettext_lazy method are both deprecated since Django 3.0[1]. These were already replaced in Horizon repo by [2]. [1] https://docs.djangoproject.com/en/3.0/releases/3.0/#id3 [2] cd7c1b5110fe1f64cd9dfbeb1072b37912d0efee Change-Id: Iee48af32956787cb4e16601fea34570f63df511c --- .../content/resource_types/panel.py | 2 +- .../content/resource_types/tables.py | 2 +- heat_dashboard/content/resource_types/tabs.py | 2 +- .../content/resource_types/views.py | 2 +- heat_dashboard/content/stacks/forms.py | 2 +- heat_dashboard/content/stacks/panel.py | 2 +- heat_dashboard/content/stacks/tables.py | 20 +++++++++---------- heat_dashboard/content/stacks/tabs.py | 2 +- heat_dashboard/content/stacks/views.py | 2 +- .../content/template_generator/panel.py | 2 +- .../content/template_generator/views.py | 2 +- .../content/template_versions/panel.py | 2 +- .../content/template_versions/tables.py | 2 +- .../content/template_versions/tabs.py | 2 +- .../content/template_versions/views.py | 2 +- .../_1610_project_orchestration_panel.py | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/heat_dashboard/content/resource_types/panel.py b/heat_dashboard/content/resource_types/panel.py index 779d1158..53c00f09 100644 --- a/heat_dashboard/content/resource_types/panel.py +++ b/heat_dashboard/content/resource_types/panel.py @@ -11,7 +11,7 @@ # See the 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 _ import horizon diff --git a/heat_dashboard/content/resource_types/tables.py b/heat_dashboard/content/resource_types/tables.py index 893e4655..39c4efd0 100644 --- a/heat_dashboard/content/resource_types/tables.py +++ b/heat_dashboard/content/resource_types/tables.py @@ -11,7 +11,7 @@ # See the 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 tables diff --git a/heat_dashboard/content/resource_types/tabs.py b/heat_dashboard/content/resource_types/tabs.py index 836e14d1..3c39ff07 100644 --- a/heat_dashboard/content/resource_types/tabs.py +++ b/heat_dashboard/content/resource_types/tabs.py @@ -11,7 +11,7 @@ # See the 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 tabs diff --git a/heat_dashboard/content/resource_types/views.py b/heat_dashboard/content/resource_types/views.py index 2b7b2edf..31dadec9 100644 --- a/heat_dashboard/content/resource_types/views.py +++ b/heat_dashboard/content/resource_types/views.py @@ -14,7 +14,7 @@ import yaml from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from horizon import exceptions from horizon import tables diff --git a/heat_dashboard/content/stacks/forms.py b/heat_dashboard/content/stacks/forms.py index d0f7760e..969a1126 100644 --- a/heat_dashboard/content/stacks/forms.py +++ b/heat_dashboard/content/stacks/forms.py @@ -17,7 +17,7 @@ import django from django.conf import settings from django.template.defaultfilters import filesizeformat from django.utils import html -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 oslo_utils import strutils diff --git a/heat_dashboard/content/stacks/panel.py b/heat_dashboard/content/stacks/panel.py index f9e88003..c0c977f6 100644 --- a/heat_dashboard/content/stacks/panel.py +++ b/heat_dashboard/content/stacks/panel.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 _ import horizon diff --git a/heat_dashboard/content/stacks/tables.py b/heat_dashboard/content/stacks/tables.py index 3fcc01a5..7dd4c7d7 100644 --- a/heat_dashboard/content/stacks/tables.py +++ b/heat_dashboard/content/stacks/tables.py @@ -14,9 +14,9 @@ from django import urls from django.http import Http404 from django.template.defaultfilters import title +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 heatclient import exc from horizon import messages @@ -55,7 +55,7 @@ class CheckStack(tables.BatchAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Check Stack", u"Check Stacks", count @@ -63,7 +63,7 @@ class CheckStack(tables.BatchAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Checked Stack", u"Checked Stacks", count @@ -81,7 +81,7 @@ class SuspendStack(tables.BatchAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Suspend Stack", u"Suspend Stacks", count @@ -89,7 +89,7 @@ class SuspendStack(tables.BatchAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Suspended Stack", u"Suspended Stacks", count @@ -108,7 +108,7 @@ class ResumeStack(tables.BatchAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Resume Stack", u"Resume Stacks", count @@ -116,7 +116,7 @@ class ResumeStack(tables.BatchAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Resumed Stack", u"Resumed Stacks", count @@ -141,7 +141,7 @@ class ChangeStackTemplate(tables.LinkAction): class DeleteStack(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Stack", u"Delete Stacks", count @@ -149,7 +149,7 @@ class DeleteStack(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted Stack", u"Deleted Stacks", count diff --git a/heat_dashboard/content/stacks/tabs.py b/heat_dashboard/content/stacks/tabs.py index 91bb3297..71647b2b 100644 --- a/heat_dashboard/content/stacks/tabs.py +++ b/heat_dashboard/content/stacks/tabs.py @@ -13,7 +13,7 @@ import logging from operator import attrgetter -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from horizon import messages from horizon import tabs diff --git a/heat_dashboard/content/stacks/views.py b/heat_dashboard/content/stacks/views.py index 6d703340..e6023798 100644 --- a/heat_dashboard/content/stacks/views.py +++ b/heat_dashboard/content/stacks/views.py @@ -18,7 +18,7 @@ import yaml from django.http import HttpResponse 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 _ import django.views.generic diff --git a/heat_dashboard/content/template_generator/panel.py b/heat_dashboard/content/template_generator/panel.py index 3a670e9c..e3c13d54 100644 --- a/heat_dashboard/content/template_generator/panel.py +++ b/heat_dashboard/content/template_generator/panel.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 _ import horizon diff --git a/heat_dashboard/content/template_generator/views.py b/heat_dashboard/content/template_generator/views.py index 3b1b163a..ff049b2e 100644 --- a/heat_dashboard/content/template_generator/views.py +++ b/heat_dashboard/content/template_generator/views.py @@ -12,7 +12,7 @@ from django.http import HttpResponse # noqa -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views import generic from horizon.browsers.views import AngularIndexView diff --git a/heat_dashboard/content/template_versions/panel.py b/heat_dashboard/content/template_versions/panel.py index 22ac7af2..713d9a91 100644 --- a/heat_dashboard/content/template_versions/panel.py +++ b/heat_dashboard/content/template_versions/panel.py @@ -11,7 +11,7 @@ # See the 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 _ import horizon diff --git a/heat_dashboard/content/template_versions/tables.py b/heat_dashboard/content/template_versions/tables.py index ba85c738..cc41b4d7 100644 --- a/heat_dashboard/content/template_versions/tables.py +++ b/heat_dashboard/content/template_versions/tables.py @@ -12,7 +12,7 @@ # limitations under the License. from django.template import defaultfilters as filters -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from horizon import tables diff --git a/heat_dashboard/content/template_versions/tabs.py b/heat_dashboard/content/template_versions/tabs.py index a9280c7b..bae1b14c 100644 --- a/heat_dashboard/content/template_versions/tabs.py +++ b/heat_dashboard/content/template_versions/tabs.py @@ -11,7 +11,7 @@ # See the 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 messages from horizon import tabs diff --git a/heat_dashboard/content/template_versions/views.py b/heat_dashboard/content/template_versions/views.py index 9039b4ed..faeed921 100644 --- a/heat_dashboard/content/template_versions/views.py +++ b/heat_dashboard/content/template_versions/views.py @@ -12,7 +12,7 @@ # limitations under the License. from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from horizon import exceptions from horizon import tables diff --git a/heat_dashboard/enabled/_1610_project_orchestration_panel.py b/heat_dashboard/enabled/_1610_project_orchestration_panel.py index f9659fdd..8671f989 100644 --- a/heat_dashboard/enabled/_1610_project_orchestration_panel.py +++ b/heat_dashboard/enabled/_1610_project_orchestration_panel.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 heat_dashboard import exceptions