From 696ab96b90e1abe15ef9be18359c09f712328a3d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 11 Jul 2022 13:38:05 +0900 Subject: [PATCH] Replace deprecated ugettext_lazy The ugettext_lazy method has been deprecated since Django 3.0[1]. This was already replaced in Horizon repo by [2]. [1] https://docs.djangoproject.com/en/3.0/releases/3.0/#id3 [2] cd7c1b5110fe1f64cd9dfbeb1072b37912d0efee Change-Id: Ideeaff4a0bc43e69c7465f34062edc5e381932d5 --- .../dashboards/admin/hashmap/forms.py | 2 +- .../dashboards/admin/hashmap/panel.py | 2 +- .../dashboards/admin/hashmap/tables.py | 28 +++++++++---------- .../dashboards/admin/hashmap/views.py | 2 +- .../dashboards/admin/modules/forms.py | 2 +- .../dashboards/admin/modules/panel.py | 2 +- .../dashboards/admin/modules/tables.py | 12 ++++---- .../dashboards/admin/modules/views.py | 2 +- .../dashboards/admin/pyscripts/forms.py | 2 +- .../dashboards/admin/pyscripts/panel.py | 2 +- .../dashboards/admin/pyscripts/tables.py | 8 +++--- .../dashboards/admin/pyscripts/views.py | 2 +- .../dashboards/admin/summary/panel.py | 2 +- .../dashboards/admin/summary/tables.py | 2 +- .../dashboards/admin/summary/views.py | 2 +- .../dashboards/project/rating/panel.py | 2 +- .../dashboards/project/rating/tables.py | 2 +- .../dashboards/project/rating/views.py | 2 +- .../dashboards/project/reporting/panel.py | 2 +- cloudkittydashboard/overrides.py | 2 +- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cloudkittydashboard/dashboards/admin/hashmap/forms.py b/cloudkittydashboard/dashboards/admin/hashmap/forms.py index 8b319a8..eb93d0d 100644 --- a/cloudkittydashboard/dashboards/admin/hashmap/forms.py +++ b/cloudkittydashboard/dashboards/admin/hashmap/forms.py @@ -14,7 +14,7 @@ from decimal import Decimal import logging -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from horizon import exceptions as horizon_exceptions from horizon import forms from horizon import messages diff --git a/cloudkittydashboard/dashboards/admin/hashmap/panel.py b/cloudkittydashboard/dashboards/admin/hashmap/panel.py index c60eb45..59da389 100644 --- a/cloudkittydashboard/dashboards/admin/hashmap/panel.py +++ b/cloudkittydashboard/dashboards/admin/hashmap/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/cloudkittydashboard/dashboards/admin/hashmap/tables.py b/cloudkittydashboard/dashboards/admin/hashmap/tables.py index c22becb..84805de 100644 --- a/cloudkittydashboard/dashboards/admin/hashmap/tables.py +++ b/cloudkittydashboard/dashboards/admin/hashmap/tables.py @@ -14,8 +14,8 @@ from collections import OrderedDict from django.urls import reverse -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 from horizon import tabs @@ -40,7 +40,7 @@ class DeleteService(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Service", u"Delete Services", count @@ -48,7 +48,7 @@ class DeleteService(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted Service", u"Deleted Services", count @@ -102,7 +102,7 @@ class DeleteGroup(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Group", u"Delete Groups", count @@ -110,7 +110,7 @@ class DeleteGroup(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted Group", u"Deleted Groups", count @@ -189,7 +189,7 @@ class DeleteServiceThreshold(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Service Threshold", u"Delete Service Thresholds", count @@ -197,7 +197,7 @@ class DeleteServiceThreshold(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted Service Threshold", u"Deleted Service Thresholds", count @@ -216,7 +216,7 @@ class DeleteFieldThreshold(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Field Threshold", u"Delete Field Thresholds", count @@ -224,7 +224,7 @@ class DeleteFieldThreshold(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted Field Threshold", u"Deleted Field Thresholds", count @@ -356,7 +356,7 @@ class DeleteField(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Field", u"Delete Fields", count @@ -364,7 +364,7 @@ class DeleteField(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted Field", u"Deleted Fields", count @@ -428,7 +428,7 @@ class DeleteMapping(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Mapping", u"Delete Mappings", count @@ -436,7 +436,7 @@ class DeleteMapping(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted Mapping", u"Deleted Mappings", count diff --git a/cloudkittydashboard/dashboards/admin/hashmap/views.py b/cloudkittydashboard/dashboards/admin/hashmap/views.py index 7ba65bc..be026be 100644 --- a/cloudkittydashboard/dashboards/admin/hashmap/views.py +++ b/cloudkittydashboard/dashboards/admin/hashmap/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 forms from horizon import tables from horizon import tabs diff --git a/cloudkittydashboard/dashboards/admin/modules/forms.py b/cloudkittydashboard/dashboards/admin/modules/forms.py index fd40cb1..dd03888 100644 --- a/cloudkittydashboard/dashboards/admin/modules/forms.py +++ b/cloudkittydashboard/dashboards/admin/modules/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 horizon import exceptions from horizon import forms from horizon import messages diff --git a/cloudkittydashboard/dashboards/admin/modules/panel.py b/cloudkittydashboard/dashboards/admin/modules/panel.py index b64e8ff..8c9e02a 100644 --- a/cloudkittydashboard/dashboards/admin/modules/panel.py +++ b/cloudkittydashboard/dashboards/admin/modules/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/cloudkittydashboard/dashboards/admin/modules/tables.py b/cloudkittydashboard/dashboards/admin/modules/tables.py index 8db05d9..ee194b3 100644 --- a/cloudkittydashboard/dashboards/admin/modules/tables.py +++ b/cloudkittydashboard/dashboards/admin/modules/tables.py @@ -13,8 +13,8 @@ # under the License. from django.urls import reverse -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 @@ -46,12 +46,12 @@ class ToggleEnabledModule(tables.BatchAction): @staticmethod def action_present(count): return ( - ungettext_lazy( + ngettext_lazy( u"Enable Module", u"Enable Modules", count ), - ungettext_lazy( + ngettext_lazy( u"Disable Module", u"Disable Modules", count @@ -61,12 +61,12 @@ class ToggleEnabledModule(tables.BatchAction): @staticmethod def action_past(count): return ( - ungettext_lazy( + ngettext_lazy( u"Enabled Module", u"Enabled Modules", count ), - ungettext_lazy( + ngettext_lazy( u"Disabled Module", u"Disabled Modules", count diff --git a/cloudkittydashboard/dashboards/admin/modules/views.py b/cloudkittydashboard/dashboards/admin/modules/views.py index f516f11..256a638 100644 --- a/cloudkittydashboard/dashboards/admin/modules/views.py +++ b/cloudkittydashboard/dashboards/admin/modules/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 horizon import forms from horizon import tables from horizon import views diff --git a/cloudkittydashboard/dashboards/admin/pyscripts/forms.py b/cloudkittydashboard/dashboards/admin/pyscripts/forms.py index 22972c5..2d3321d 100644 --- a/cloudkittydashboard/dashboards/admin/pyscripts/forms.py +++ b/cloudkittydashboard/dashboards/admin/pyscripts/forms.py @@ -15,7 +15,7 @@ import logging from django.utils.text import normalize_newlines -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from horizon import exceptions from horizon import forms from horizon import messages diff --git a/cloudkittydashboard/dashboards/admin/pyscripts/panel.py b/cloudkittydashboard/dashboards/admin/pyscripts/panel.py index e21cd86..4296bb7 100644 --- a/cloudkittydashboard/dashboards/admin/pyscripts/panel.py +++ b/cloudkittydashboard/dashboards/admin/pyscripts/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/cloudkittydashboard/dashboards/admin/pyscripts/tables.py b/cloudkittydashboard/dashboards/admin/pyscripts/tables.py index 475d36d..76a9331 100644 --- a/cloudkittydashboard/dashboards/admin/pyscripts/tables.py +++ b/cloudkittydashboard/dashboards/admin/pyscripts/tables.py @@ -13,8 +13,8 @@ # under the License. from django.urls import reverse -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 @@ -55,7 +55,7 @@ class DeletePyScript(tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete PyScript", u"Delete PyScripts", count @@ -63,7 +63,7 @@ class DeletePyScript(tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Deleted PyScript", u"Deleted PyScripts", count diff --git a/cloudkittydashboard/dashboards/admin/pyscripts/views.py b/cloudkittydashboard/dashboards/admin/pyscripts/views.py index f37993a..64ecdd5 100644 --- a/cloudkittydashboard/dashboards/admin/pyscripts/views.py +++ b/cloudkittydashboard/dashboards/admin/pyscripts/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 horizon import forms from horizon import tables from horizon import views diff --git a/cloudkittydashboard/dashboards/admin/summary/panel.py b/cloudkittydashboard/dashboards/admin/summary/panel.py index a4e98ea..933a4c9 100644 --- a/cloudkittydashboard/dashboards/admin/summary/panel.py +++ b/cloudkittydashboard/dashboards/admin/summary/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/cloudkittydashboard/dashboards/admin/summary/tables.py b/cloudkittydashboard/dashboards/admin/summary/tables.py index 8b97c36..3dd1e6d 100644 --- a/cloudkittydashboard/dashboards/admin/summary/tables.py +++ b/cloudkittydashboard/dashboards/admin/summary/tables.py @@ -13,7 +13,7 @@ # 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 tables diff --git a/cloudkittydashboard/dashboards/admin/summary/views.py b/cloudkittydashboard/dashboards/admin/summary/views.py index 4f53f28..acb9f0d 100644 --- a/cloudkittydashboard/dashboards/admin/summary/views.py +++ b/cloudkittydashboard/dashboards/admin/summary/views.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 tables from openstack_dashboard.api import keystone as api_keystone diff --git a/cloudkittydashboard/dashboards/project/rating/panel.py b/cloudkittydashboard/dashboards/project/rating/panel.py index 595a9df..8b51fe2 100644 --- a/cloudkittydashboard/dashboards/project/rating/panel.py +++ b/cloudkittydashboard/dashboards/project/rating/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 from openstack_dashboard.dashboards.project import dashboard diff --git a/cloudkittydashboard/dashboards/project/rating/tables.py b/cloudkittydashboard/dashboards/project/rating/tables.py index d748225..1855e6f 100644 --- a/cloudkittydashboard/dashboards/project/rating/tables.py +++ b/cloudkittydashboard/dashboards/project/rating/tables.py @@ -11,7 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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/cloudkittydashboard/dashboards/project/rating/views.py b/cloudkittydashboard/dashboards/project/rating/views.py index 75f6cd9..e5565ba 100644 --- a/cloudkittydashboard/dashboards/project/rating/views.py +++ b/cloudkittydashboard/dashboards/project/rating/views.py @@ -15,7 +15,7 @@ import json from django.conf import settings from django import http -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/cloudkittydashboard/dashboards/project/reporting/panel.py b/cloudkittydashboard/dashboards/project/reporting/panel.py index 382afbc..2266250 100644 --- a/cloudkittydashboard/dashboards/project/reporting/panel.py +++ b/cloudkittydashboard/dashboards/project/reporting/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 from openstack_dashboard.dashboards.project import dashboard diff --git a/cloudkittydashboard/overrides.py b/cloudkittydashboard/overrides.py index b6034c6..01a713a 100644 --- a/cloudkittydashboard/overrides.py +++ b/cloudkittydashboard/overrides.py @@ -14,7 +14,7 @@ # under the License. # -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from openstack_dashboard.dashboards.project.instances.workflows \ import create_instance