Merge "Replace deprecated ugettext_lazy and ungettext_lazy"

mistraldashboard/action_executions/forms.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import forms
 

mistraldashboard/action_executions/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from mistraldashboard import dashboard

mistraldashboard/action_executions/tables.py

@@ -14,8 +14,8 @@
 
 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
 
@@ -37,7 +37,7 @@ class UpdateRow(tables.Row):
 class DeleteActionExecution(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Action Execution",
             u"Delete Action Executions",
             count
@@ -45,7 +45,7 @@ class DeleteActionExecution(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Action Execution",
             u"Deleted Action Executions",
             count

mistraldashboard/action_executions/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 django.views import generic
 
 from horizon import forms

mistraldashboard/actions/forms.py

@@ -15,7 +15,7 @@
 import json
 
 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

mistraldashboard/actions/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

mistraldashboard/actions/tables.py

@@ -13,8 +13,8 @@
 # limitations 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 horizon.utils import filters
@@ -45,7 +45,7 @@ class UpdateAction(tables.LinkAction):
 class DeleteAction(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Action",
             u"Delete Actions",
             count
@@ -53,7 +53,7 @@ class DeleteAction(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Action",
             u"Deleted Actions",
             count

mistraldashboard/actions/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 django.views import generic
 
 from horizon import exceptions

mistraldashboard/api.py

@@ -15,7 +15,7 @@
 import itertools
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon.utils import functions as utils
 from horizon.utils import memoized

mistraldashboard/cron_triggers/forms.py

@@ -14,7 +14,7 @@
 
 import json
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import forms
 from horizon import messages

mistraldashboard/cron_triggers/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from mistraldashboard import dashboard

mistraldashboard/cron_triggers/tables.py

@@ -14,8 +14,8 @@
 
 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
 
@@ -34,7 +34,7 @@ class CreateCronTrigger(tables.LinkAction):
 class DeleteCronTrigger(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Cron Trigger",
             u"Delete Cron Triggers",
             count
@@ -42,7 +42,7 @@ class DeleteCronTrigger(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Cron Trigger",
             u"Deleted Cron Triggers",
             count

mistraldashboard/cron_triggers/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 django.views import generic
 
 from horizon import forms

mistraldashboard/dashboard.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

mistraldashboard/default/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

mistraldashboard/executions/forms.py

@@ -11,7 +11,7 @@
 # limitations under the License.
 
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

mistraldashboard/executions/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from mistraldashboard import dashboard

mistraldashboard/executions/tables.py

@@ -12,8 +12,8 @@
 # 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 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
@@ -29,7 +29,7 @@ smart_cell.init()
 class DeleteExecution(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Execution",
             u"Delete Executions",
             count
@@ -37,7 +37,7 @@ class DeleteExecution(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Execution",
             u"Deleted Executions",
             count
@@ -53,7 +53,7 @@ class CancelExecution(tables.BatchAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Cancel Execution",
             u"Cancel Executions",
             count
@@ -61,7 +61,7 @@ class CancelExecution(tables.BatchAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Canceled Execution",
             u"Canceled Executions",
             count
@@ -81,7 +81,7 @@ class PauseExecution(tables.BatchAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Pause Execution",
             u"Pause Executions",
             count
@@ -89,7 +89,7 @@ class PauseExecution(tables.BatchAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Paused Execution",
             u"Paused Executions",
             count
@@ -109,7 +109,7 @@ class ResumeExecution(tables.BatchAction):
 
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Resume Execution",
             u"Resume Executions",
             count
@@ -117,7 +117,7 @@ class ResumeExecution(tables.BatchAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Resumed Execution",
             u"Resumed Executions",
             count

mistraldashboard/executions/views.py

@@ -16,7 +16,7 @@ from django.views import generic
 
 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

mistraldashboard/tasks/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 from mistraldashboard import dashboard

mistraldashboard/tasks/tables.py

@@ -14,7 +14,7 @@
 
 from django.template.defaultfilters import title
 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

mistraldashboard/tasks/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 django.views import generic
 
 from horizon import exceptions

mistraldashboard/workbooks/forms.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

mistraldashboard/workbooks/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

mistraldashboard/workbooks/tables.py

@@ -12,8 +12,8 @@
 # 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 ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from horizon import tables
 from horizon.utils import filters
@@ -40,7 +40,7 @@ class UpdateWorkbook(tables.LinkAction):
 class DeleteWorkbook(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Workbook",
             u"Delete Workbooks",
             count
@@ -48,7 +48,7 @@ class DeleteWorkbook(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Workbook",
             u"Deleted Workbooks",
             count

mistraldashboard/workbooks/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 django.views import generic
 
 from horizon import exceptions

mistraldashboard/workflows/forms.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from horizon import exceptions
 from horizon import forms

mistraldashboard/workflows/panel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import horizon
 

mistraldashboard/workflows/tables.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from django.template.defaultfilters import title
-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.utils import filters
@@ -41,7 +41,7 @@ class UpdateWorkflow(tables.LinkAction):
 class DeleteWorkflow(tables.DeleteAction):
     @staticmethod
     def action_present(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Delete Workflow",
             u"Delete Workflows",
             count
@@ -49,7 +49,7 @@ class DeleteWorkflow(tables.DeleteAction):
 
     @staticmethod
     def action_past(count):
-        return ungettext_lazy(
+        return ngettext_lazy(
             u"Deleted Workflow",
             u"Deleted Workflows",
             count

mistraldashboard/workflows/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 django.views import generic
 
 from horizon import exceptions