diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/forms.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/forms.py index a99a32a..fc84bf7 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/forms.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/forms.py @@ -16,7 +16,7 @@ import logging from operator import attrgetter 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 forms from horizon import messages diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/panel.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/panel.py index 9186ecd..ee07305 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/panel.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/panel.py @@ -14,7 +14,7 @@ import logging -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ import horizon from openstack_dashboard.api import neutron diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tables.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tables.py index 0a90bc1..16742bb 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tables.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tables.py @@ -16,9 +16,9 @@ import logging from django.template import defaultfilters as filters from django.urls import reverse +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 exceptions from horizon import tables @@ -65,7 +65,7 @@ class DeleteRuleLink(policy.PolicyTargetMixin, tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Rule", u"Delete Rules", count @@ -73,7 +73,7 @@ class DeleteRuleLink(policy.PolicyTargetMixin, tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Scheduled deletion of Rule", u"Scheduled deletion of Rules", count @@ -97,7 +97,7 @@ class DeletePolicyLink(policy.PolicyTargetMixin, tables.DeleteAction): @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Policy", u"Delete Policies", count @@ -105,7 +105,7 @@ class DeletePolicyLink(policy.PolicyTargetMixin, tables.DeleteAction): @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Scheduled deletion of Policy", u"Scheduled deletion of Policies", count @@ -125,7 +125,7 @@ class DeleteFirewallGroupLink(policy.PolicyTargetMixin, @staticmethod def action_present(count): - return ungettext_lazy( + return ngettext_lazy( u"Delete Firewall Group", u"Delete Firewall Groups", count @@ -133,7 +133,7 @@ class DeleteFirewallGroupLink(policy.PolicyTargetMixin, @staticmethod def action_past(count): - return ungettext_lazy( + return ngettext_lazy( u"Scheduled deletion of Firewall Group", u"Scheduled deletion of Firewall Groups", count diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tabs.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tabs.py index f462e3b..59e4f04 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tabs.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/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 diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/views.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/views.py index 58646d0..4653de5 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/views.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/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 exceptions from horizon import forms diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/widgets.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/widgets.py index 675b0b8..0aec413 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/widgets.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/widgets.py @@ -13,7 +13,7 @@ import itertools from django.template.loader import get_template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from horizon.forms import fields """A custom Horizon Forms Select widget that displays select choices as a table diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/workflows.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/workflows.py index d7eb73c..f2ca5df 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/workflows.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/workflows.py @@ -13,7 +13,7 @@ # under the License. from operator import attrgetter -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.utils import validators