diff --git a/tacker_horizon/openstack_dashboard/api/tacker.py b/tacker_horizon/openstack_dashboard/api/tacker.py index 77ed68e..18910c5 100644 --- a/tacker_horizon/openstack_dashboard/api/tacker.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/dashboard.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/dashboard.py index f122438..6b93802 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/dashboard.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/forms.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/forms.py index 39fd1eb..cd80266 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/forms.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/panel.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/panel.py index 7371697..8e6a159 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/panel.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tables.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tables.py index a9a9ae4..2d66c3c 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tables.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tabs.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tabs.py index 4976e2e..680d197 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tabs.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/views.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/views.py index d1bd7ea..2e21168 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/views.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/forms.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/forms.py index 6e781ae..1ac33de 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/forms.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/panel.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/panel.py index 66797c0..31d0c8d 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/panel.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tables.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tables.py index 8fbecac..8b7fe64 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tables.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tabs.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tabs.py index bb1b412..b2cb1f2 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tabs.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/views.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/views.py index 8d54692..cc3e22b 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/views.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/utils.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/utils.py index cd9497f..853ca89 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/utils.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/forms.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/forms.py index 692a22a..9904f5f 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/forms.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/panel.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/panel.py index 7e70d1a..8218ef5 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/panel.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tables.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tables.py index b90ea35..fb2e938 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tables.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tabs.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tabs.py index fd25779..0785178 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tabs.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/views.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/views.py index 60d3a8f..6035f3e 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vim/views.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/forms.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/forms.py index 229f95d..d277942 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/forms.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/panel.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/panel.py index db36738..e494339 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/panel.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tables.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tables.py index 63bede3..6ef20ac 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tables.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tabs.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tabs.py index 7a58f53..55c743f 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tabs.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/views.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/views.py index 4f8ac81..ede4724 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/views.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/forms.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/forms.py index 413db5c..3c80f2a 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/forms.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/panel.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/panel.py index 1fcd856..e06dd8e 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/panel.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tables.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tables.py index 4e0f82b..9f07349 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tables.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tabs.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tabs.py index 70829ac..c10e403 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tabs.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/views.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/views.py index 47c249b..611a65a 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/views.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/forms.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/forms.py index 54db755..90eea0f 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/forms.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/panel.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/panel.py index 51d12cc..a367234 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/panel.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tables.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tables.py index 3db2aa4..637ea2d 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tables.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tabs.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tabs.py index 44034b0..70214bb 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tabs.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/views.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/views.py index 0a42c40..84fe111 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/views.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/forms.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/forms.py index 28b552b..c6ea4e4 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/forms.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/panel.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/panel.py index 684ca58..fc923eb 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/panel.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tables.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tables.py index eb693b6..ad0c439 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tables.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tabs.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tabs.py index 644e724..6fe0542 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tabs.py +++ b/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 diff --git a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/views.py b/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/views.py index a43fd9f..de3d517 100644 --- a/tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/views.py +++ b/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 diff --git a/tox.ini b/tox.ini index 9b63540..51b541f 100644 --- a/tox.ini +++ b/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