Merge "Use gettext_lazy/ngettext_lazy instead of ugettext_lazy/ungettext_lazy"

manila_ui/dashboards/admin/defaults/tables.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 tables
 

manila_ui/dashboards/admin/defaults/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

manila_ui/dashboards/admin/defaults/workflows.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 forms

manila_ui/dashboards/admin/security_services/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
 

manila_ui/dashboards/admin/security_services/tables.py

@@ -10,8 +10,8 @@
 # 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 ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 from horizon import tables
 
 from manila_ui.api import manila
@@ -22,7 +22,7 @@ class DeleteSecurityService(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Security Service",
             u"Delete Security Services",
             count
@@ -30,7 +30,7 @@ class DeleteSecurityService(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Security Service",
             u"Deleted Security Services",
             count

manila_ui/dashboards/admin/security_services/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 tabs
 
 

manila_ui/dashboards/admin/security_services/views.py

@@ -17,7 +17,7 @@ Admin views for managing security services.
 """
 
 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 tables
 from horizon.utils import memoized

manila_ui/dashboards/admin/share_group_snapshots/forms.py

@@ -14,7 +14,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 exceptions
 from horizon import forms
 from horizon import messages

manila_ui/dashboards/admin/share_group_snapshots/panel.py

@@ -13,7 +13,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.admin import dashboard
 

manila_ui/dashboards/admin/share_group_snapshots/tables.py

@@ -15,9 +15,9 @@
 
 from django.template.defaultfilters import title
 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
 from horizon.utils import filters
@@ -34,7 +34,7 @@ class DeleteShareGroupSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Group Snapshot",
             u"Delete Share Group Snapshots",
             count
@@ -42,7 +42,7 @@ class DeleteShareGroupSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Group Snapshot",
             u"Deleted Share Group Snapshots",
             count

manila_ui/dashboards/admin/share_group_snapshots/tabs.py

@@ -13,7 +13,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 tabs
 
 

manila_ui/dashboards/admin/share_group_snapshots/views.py

@@ -19,7 +19,7 @@ Admin views for managing share group snapshots.
 
 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
 from horizon import tables

manila_ui/dashboards/admin/share_group_types/forms.py

@@ -15,7 +15,7 @@
 
 from django.conf import settings
 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
 from horizon import messages

manila_ui/dashboards/admin/share_group_types/panel.py

@@ -13,7 +13,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.admin import dashboard
 

manila_ui/dashboards/admin/share_group_types/tables.py

@@ -13,8 +13,8 @@
 # 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 ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 from horizon import tables
 
 from manila_ui.api import manila
@@ -31,7 +31,7 @@ class CreateShareGroupType(tables.LinkAction):
 class DeleteShareGroupType(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Group Type",
             u"Delete Share Group Types",
             count
@@ -39,7 +39,7 @@ class DeleteShareGroupType(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Group Type",
             u"Deleted Share Group Types",
             count

manila_ui/dashboards/admin/share_group_types/views.py

@@ -19,7 +19,7 @@ Admin views for managing share group types.
 
 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
 from horizon import tables

manila_ui/dashboards/admin/share_group_types/workflows.py

@@ -13,7 +13,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 workflows

manila_ui/dashboards/admin/share_groups/forms.py

@@ -14,7 +14,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 exceptions
 from horizon import forms
 from horizon import messages

manila_ui/dashboards/admin/share_groups/panel.py

@@ -13,7 +13,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.admin import dashboard
 

manila_ui/dashboards/admin/share_groups/tables.py

@@ -14,8 +14,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
 
 from manila_ui.api import manila
@@ -25,7 +25,7 @@ class DeleteShareGroup(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Group",
             u"Delete Share Groups",
             count
@@ -33,7 +33,7 @@ class DeleteShareGroup(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Group",
             u"Deleted Share Groups",
             count

manila_ui/dashboards/admin/share_groups/tabs.py

@@ -13,7 +13,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 tabs
 
 

manila_ui/dashboards/admin/share_groups/views.py

@@ -19,7 +19,7 @@ Admin views for managing share groups.
 
 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
 from horizon import tables

manila_ui/dashboards/admin/share_instances/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.admin import dashboard
 

manila_ui/dashboards/admin/share_instances/tables.py

@@ -11,7 +11,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
 
 

manila_ui/dashboards/admin/share_instances/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 tabs
 
 

manila_ui/dashboards/admin/share_instances/views.py

@@ -17,7 +17,7 @@ Admin views for managing share instances.
 """
 
 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
 from horizon import tabs

manila_ui/dashboards/admin/share_networks/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.admin import dashboard
 

manila_ui/dashboards/admin/share_networks/tables.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 tables
 
 import manila_ui.dashboards.project.share_networks.tables as sn_tables

manila_ui/dashboards/admin/share_networks/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 tabs
 
 

manila_ui/dashboards/admin/share_networks/views.py

@@ -17,7 +17,7 @@ Admin views for managing share networks.
 """
 
 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 tables
 from horizon.utils import memoized

manila_ui/dashboards/admin/share_servers/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.admin import dashboard
 

manila_ui/dashboards/admin/share_servers/tables.py

@@ -12,9 +12,9 @@
 
 from django.template.defaultfilters import title
 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 tables
 
 from manila_ui.api import manila
@@ -25,7 +25,7 @@ class DeleteShareServer(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Server",
             u"Delete Share Server",
             count
@@ -33,7 +33,7 @@ class DeleteShareServer(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Server",
             u"Deleted Share Server",
             count

manila_ui/dashboards/admin/share_servers/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 tabs
 
 

manila_ui/dashboards/admin/share_servers/views.py

@@ -18,7 +18,7 @@ Admin views for managing share servers.
 
 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 tables
 from horizon import tabs

manila_ui/dashboards/admin/share_snapshots/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.admin import dashboard
 

manila_ui/dashboards/admin/share_snapshots/tables.py

@@ -13,9 +13,9 @@
 
 from django.template.defaultfilters import title
 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
 
@@ -37,7 +37,7 @@ class DeleteShareSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Snapshot",
             u"Delete Snapshots",
             count
@@ -45,7 +45,7 @@ class DeleteShareSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Snapshot",
             u"Deleted Snapshots",
             count

manila_ui/dashboards/admin/share_snapshots/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 tabs
 
 

manila_ui/dashboards/admin/share_snapshots/views.py

@@ -17,7 +17,7 @@ Admin views for managing share snapshots.
 """
 
 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 tables
 from horizon.utils import memoized

manila_ui/dashboards/admin/share_types/forms.py

@@ -15,7 +15,7 @@
 
 from django.conf import settings
 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
 from horizon import messages

manila_ui/dashboards/admin/share_types/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
 

manila_ui/dashboards/admin/share_types/tables.py

@@ -10,8 +10,8 @@
 # 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 ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 from horizon import tables
 
 from manila_ui.api import manila
@@ -32,7 +32,7 @@ class CreateShareType(tables.LinkAction):
 class DeleteShareType(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Type",
             u"Delete Share Types",
             count
@@ -40,7 +40,7 @@ class DeleteShareType(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Type",
             u"Deleted Share Types",
             count

manila_ui/dashboards/admin/share_types/views.py

@@ -16,7 +16,7 @@ Admin views for managing share types.
 
 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
 from horizon import tables

manila_ui/dashboards/admin/share_types/workflows.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 forms

manila_ui/dashboards/admin/shares/forms.py

@@ -16,7 +16,7 @@
 from django.conf import settings
 from django.forms import ValidationError
 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

manila_ui/dashboards/admin/shares/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.admin import dashboard
 

manila_ui/dashboards/admin/shares/replicas/forms.py

@@ -14,7 +14,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 exceptions
 from horizon import forms

manila_ui/dashboards/admin/shares/replicas/tables.py

@@ -14,8 +14,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 messages
 from horizon import tables
@@ -92,7 +92,7 @@ class DeleteReplica(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Replica",
             u"Delete Replicas",
             count
@@ -100,7 +100,7 @@ class DeleteReplica(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Replica",
             u"Deleted Replicas",
             count

manila_ui/dashboards/admin/shares/replicas/tabs.py

@@ -13,7 +13,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 tabs
 

manila_ui/dashboards/admin/shares/replicas/views.py

@@ -14,7 +14,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 exceptions
 from horizon import forms

manila_ui/dashboards/admin/shares/tables.py

@@ -11,7 +11,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
 
 from manila_ui.dashboards.project.shares import tables as shares_tables

manila_ui/dashboards/admin/shares/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 tabs
 
 

manila_ui/dashboards/admin/shares/views.py

@@ -18,7 +18,7 @@ Admin views for managing shares.
 
 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
 from horizon import tables

manila_ui/dashboards/admin/user_messages/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.admin import dashboard
 

manila_ui/dashboards/admin/user_messages/tables.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 manila_ui.dashboards.project.user_messages import tables as project_tables

manila_ui/dashboards/admin/user_messages/views.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 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.utils import memoized
 

manila_ui/dashboards/admin/utils.py

@@ -14,7 +14,7 @@
 
 from oslo_utils import timeutils
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from horizon import exceptions
 from openstack_dashboard.api import keystone
 

manila_ui/dashboards/identity/projects/workflows.py

@@ -12,7 +12,7 @@
 
 import logging
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/security_services/forms.py

@@ -15,7 +15,7 @@
 
 from django.forms import ValidationError
 from django.urls import reverse
-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
 from horizon import forms

manila_ui/dashboards/project/security_services/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
 

manila_ui/dashboards/project/security_services/tables.py

@@ -13,8 +13,8 @@
 # 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 ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 from horizon import tables
 from manila_ui.api import manila
 
@@ -33,7 +33,7 @@ class Delete(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Security Service",
             u"Delete Security Services",
             count
@@ -41,7 +41,7 @@ class Delete(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Security Service",
             u"Deleted Security Services",
             count

manila_ui/dashboards/project/security_services/tabs.py

@@ -11,7 +11,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 tabs
 
 

manila_ui/dashboards/project/security_services/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
 from horizon import tables

manila_ui/dashboards/project/share_group_snapshots/forms.py

@@ -14,7 +14,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 exceptions
 from horizon import forms
 from horizon import messages

manila_ui/dashboards/project/share_group_snapshots/panel.py

@@ -13,7 +13,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
 

manila_ui/dashboards/project/share_group_snapshots/tables.py

@@ -16,9 +16,9 @@
 from django.template.defaultfilters import title
 from django.urls import reverse
 from django.utils.http import urlencode
+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
 from horizon.utils import filters
@@ -74,7 +74,7 @@ class DeleteShareGroupSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Group Snapshot",
             u"Delete Share Group Snapshots",
             count
@@ -82,7 +82,7 @@ class DeleteShareGroupSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Group Snapshot",
             u"Deleted Share Group Snapshots",
             count

manila_ui/dashboards/project/share_group_snapshots/tabs.py

@@ -13,7 +13,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 tabs
 
 

manila_ui/dashboards/project/share_group_snapshots/views.py

@@ -19,7 +19,7 @@ Project views for managing share group snapshots.
 
 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
 from horizon import tables

manila_ui/dashboards/project/share_groups/forms.py

@@ -15,7 +15,7 @@
 
 from django.forms import ValidationError
 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

manila_ui/dashboards/project/share_groups/panel.py

@@ -13,7 +13,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
 

manila_ui/dashboards/project/share_groups/tables.py

@@ -14,8 +14,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
 
 from manila_ui.api import manila
@@ -36,7 +36,7 @@ class DeleteShareGroup(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Group",
             u"Delete Share Groups",
             count
@@ -44,7 +44,7 @@ class DeleteShareGroup(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Group",
             u"Deleted Share Groups",
             count

manila_ui/dashboards/project/share_groups/tabs.py

@@ -13,7 +13,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 tabs
 
 

manila_ui/dashboards/project/share_groups/views.py

@@ -19,7 +19,7 @@ Project views for managing share groups.
 
 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
 from horizon import tables

manila_ui/dashboards/project/share_networks/forms.py

@@ -14,7 +14,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 exceptions
 from horizon import forms
 from horizon import messages

manila_ui/dashboards/project/share_networks/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
 

manila_ui/dashboards/project/share_networks/tables.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+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 tables
 from openstack_dashboard.api import base
 from openstack_dashboard.api import neutron
@@ -40,7 +40,7 @@ class Delete(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Network",
             u"Delete Share Networks",
             count
@@ -48,7 +48,7 @@ class Delete(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Network",
             u"Deleted Share Networks",
             count

manila_ui/dashboards/project/share_networks/tabs.py

@@ -11,7 +11,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 tabs
 
 

manila_ui/dashboards/project/share_networks/views.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 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
 from horizon import tables

manila_ui/dashboards/project/share_networks/workflows.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 forms

manila_ui/dashboards/project/share_snapshots/forms.py

@@ -18,7 +18,7 @@ Views for managing share snapshots.
 """
 
 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

manila_ui/dashboards/project/share_snapshots/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
 

manila_ui/dashboards/project/share_snapshots/tables.py

@@ -16,9 +16,9 @@ from django.template.defaultfilters import title
 from django.urls import reverse
 from django.utils.http import urlencode
 from django.utils.text import format_lazy
+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
 
@@ -90,7 +90,7 @@ class DeleteShareSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Snapshot",
             u"Delete Share Snapshots",
             count
@@ -98,7 +98,7 @@ class DeleteShareSnapshot(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Snapshot",
             u"Deleted Share Snapshots",
             count
@@ -190,7 +190,7 @@ class DeleteShareSnapshotRule(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share Snapshot Rule",
             u"Delete Share Snapshot Rules",
             count
@@ -198,7 +198,7 @@ class DeleteShareSnapshotRule(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share Snapshot Rule",
             u"Deleted Share Snapshot Rules",
             count

manila_ui/dashboards/project/share_snapshots/tabs.py

@@ -11,7 +11,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 tabs
 
 

manila_ui/dashboards/project/share_snapshots/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
 from horizon import tables

manila_ui/dashboards/project/shares/__init__.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
 

manila_ui/dashboards/project/shares/forms.py

@@ -16,7 +16,7 @@
 from django.conf import settings
 from django.forms import ValidationError
 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

manila_ui/dashboards/project/shares/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
 

manila_ui/dashboards/project/shares/replicas/forms.py

@@ -14,7 +14,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 exceptions
 from horizon import forms

manila_ui/dashboards/project/shares/replicas/tables.py

@@ -15,9 +15,9 @@
 
 from django.template.defaultfilters import title
 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 messages
 from horizon import tables
@@ -78,7 +78,7 @@ class DeleteReplica(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Replica",
             u"Delete Replicas",
             count
@@ -86,7 +86,7 @@ class DeleteReplica(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Replica",
             u"Deleted Replicas",
             count

manila_ui/dashboards/project/shares/replicas/tabs.py

@@ -13,7 +13,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 tabs
 

manila_ui/dashboards/project/shares/replicas/views.py

@@ -14,7 +14,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 exceptions
 from horizon import forms

manila_ui/dashboards/project/shares/tables.py

@@ -15,9 +15,9 @@
 from django.template.defaultfilters import title
 from django.urls import reverse
 from django.utils.text import format_lazy
+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 messages
 from horizon import tables
@@ -40,7 +40,7 @@ class DeleteShare(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Share",
             u"Delete Shares",
             count
@@ -48,7 +48,7 @@ class DeleteShare(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Share",
             u"Deleted Shares",
             count
@@ -325,7 +325,7 @@ class DeleteRule(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Rule",
             u"Delete Rules",
             count
@@ -333,7 +333,7 @@ class DeleteRule(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Rule",
             u"Deleted Rules",
             count

manila_ui/dashboards/project/shares/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 tabs
 
 

manila_ui/dashboards/project/shares/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
 from horizon import tables

manila_ui/dashboards/project/user_messages/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
 

manila_ui/dashboards/project/user_messages/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 exceptions
 from horizon import tables
 from horizon.utils.filters import parse_isotime
@@ -31,7 +31,7 @@ class DeleteUserMessage(tables.DeleteAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete User Message",
             u"Delete User Messages",
             count
@@ -39,7 +39,7 @@ class DeleteUserMessage(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted User Message",
             u"Deleted User Messages",
             count

manila_ui/dashboards/project/user_messages/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 tabs
 
 

manila_ui/dashboards/project/user_messages/views.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 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 tables
 from horizon import tabs

manila_ui/dashboards/utils.py

@@ -14,7 +14,7 @@
 
 from django.forms import ValidationError
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 html_escape_table = {

manila_ui/tests/dashboards/project/tests.py

@@ -39,7 +39,7 @@ class PieChartsTests(test.TestCase):
         }
         existing_chart_name = "Foo"
         existing_chart = {
-            "name": translation.ugettext_lazy(existing_chart_name),
+            "name": translation.gettext_lazy(existing_chart_name),
             "used": 11,
             "max": 13,
             "text": "fake_text",