diff --git a/mistraldashboard/action_executions/forms.py b/mistraldashboard/action_executions/forms.py index 9ab9256..266a157 100644 --- a/mistraldashboard/action_executions/forms.py +++ b/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 diff --git a/mistraldashboard/action_executions/panel.py b/mistraldashboard/action_executions/panel.py index 49ee90a..04249bd 100644 --- a/mistraldashboard/action_executions/panel.py +++ b/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 diff --git a/mistraldashboard/action_executions/tables.py b/mistraldashboard/action_executions/tables.py index d7a4c77..2cf231b 100644 --- a/mistraldashboard/action_executions/tables.py +++ b/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 diff --git a/mistraldashboard/action_executions/views.py b/mistraldashboard/action_executions/views.py index 055378d..e77ba09 100644 --- a/mistraldashboard/action_executions/views.py +++ b/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 diff --git a/mistraldashboard/actions/forms.py b/mistraldashboard/actions/forms.py index 7d69247..8a51f4a 100644 --- a/mistraldashboard/actions/forms.py +++ b/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 diff --git a/mistraldashboard/actions/panel.py b/mistraldashboard/actions/panel.py index 5e42d1f..9047dfb 100644 --- a/mistraldashboard/actions/panel.py +++ b/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 diff --git a/mistraldashboard/actions/tables.py b/mistraldashboard/actions/tables.py index bde3cd9..db75549 100644 --- a/mistraldashboard/actions/tables.py +++ b/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 diff --git a/mistraldashboard/actions/views.py b/mistraldashboard/actions/views.py index c59891b..beecec8 100644 --- a/mistraldashboard/actions/views.py +++ b/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 diff --git a/mistraldashboard/api.py b/mistraldashboard/api.py index 01125ce..ff4f95a 100644 --- a/mistraldashboard/api.py +++ b/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 diff --git a/mistraldashboard/cron_triggers/forms.py b/mistraldashboard/cron_triggers/forms.py index 87781d1..a7a9de2 100644 --- a/mistraldashboard/cron_triggers/forms.py +++ b/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 diff --git a/mistraldashboard/cron_triggers/panel.py b/mistraldashboard/cron_triggers/panel.py index 8a9ddbb..7ec2b1c 100644 --- a/mistraldashboard/cron_triggers/panel.py +++ b/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 diff --git a/mistraldashboard/cron_triggers/tables.py b/mistraldashboard/cron_triggers/tables.py index 6869fb6..cd3dadc 100644 --- a/mistraldashboard/cron_triggers/tables.py +++ b/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 diff --git a/mistraldashboard/cron_triggers/views.py b/mistraldashboard/cron_triggers/views.py index 6e4dfb3..47c897e 100644 --- a/mistraldashboard/cron_triggers/views.py +++ b/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 diff --git a/mistraldashboard/dashboard.py b/mistraldashboard/dashboard.py index 40b64a2..e1fc4ff 100644 --- a/mistraldashboard/dashboard.py +++ b/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 diff --git a/mistraldashboard/default/panel.py b/mistraldashboard/default/panel.py index 0af39ba..bca2918 100644 --- a/mistraldashboard/default/panel.py +++ b/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 diff --git a/mistraldashboard/executions/forms.py b/mistraldashboard/executions/forms.py index 93fd851..18cd46e 100644 --- a/mistraldashboard/executions/forms.py +++ b/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 diff --git a/mistraldashboard/executions/panel.py b/mistraldashboard/executions/panel.py index 03ab812..c67b5e8b 100644 --- a/mistraldashboard/executions/panel.py +++ b/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 diff --git a/mistraldashboard/executions/tables.py b/mistraldashboard/executions/tables.py index e0d8991..40f1da6 100644 --- a/mistraldashboard/executions/tables.py +++ b/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 diff --git a/mistraldashboard/executions/views.py b/mistraldashboard/executions/views.py index f0017a0..2e25df0 100644 --- a/mistraldashboard/executions/views.py +++ b/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 diff --git a/mistraldashboard/tasks/panel.py b/mistraldashboard/tasks/panel.py index 286b192..ac7cdaf 100644 --- a/mistraldashboard/tasks/panel.py +++ b/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 diff --git a/mistraldashboard/tasks/tables.py b/mistraldashboard/tasks/tables.py index c98b24a..ce770fc 100644 --- a/mistraldashboard/tasks/tables.py +++ b/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 diff --git a/mistraldashboard/tasks/views.py b/mistraldashboard/tasks/views.py index 5c862fe..f8d66de 100644 --- a/mistraldashboard/tasks/views.py +++ b/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 diff --git a/mistraldashboard/workbooks/forms.py b/mistraldashboard/workbooks/forms.py index c86e137..2f4737c 100644 --- a/mistraldashboard/workbooks/forms.py +++ b/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 diff --git a/mistraldashboard/workbooks/panel.py b/mistraldashboard/workbooks/panel.py index 4915eb9..c1b87fb 100644 --- a/mistraldashboard/workbooks/panel.py +++ b/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 diff --git a/mistraldashboard/workbooks/tables.py b/mistraldashboard/workbooks/tables.py index 1891c8b..0280ef2 100644 --- a/mistraldashboard/workbooks/tables.py +++ b/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 diff --git a/mistraldashboard/workbooks/views.py b/mistraldashboard/workbooks/views.py index 9bb1d59..b4e7a2b 100644 --- a/mistraldashboard/workbooks/views.py +++ b/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 diff --git a/mistraldashboard/workflows/forms.py b/mistraldashboard/workflows/forms.py index 06e9863..5939ad7 100644 --- a/mistraldashboard/workflows/forms.py +++ b/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 diff --git a/mistraldashboard/workflows/panel.py b/mistraldashboard/workflows/panel.py index 78475f5..9780798 100644 --- a/mistraldashboard/workflows/panel.py +++ b/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 diff --git a/mistraldashboard/workflows/tables.py b/mistraldashboard/workflows/tables.py index c100a62..7cc7d69 100644 --- a/mistraldashboard/workflows/tables.py +++ b/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 diff --git a/mistraldashboard/workflows/views.py b/mistraldashboard/workflows/views.py index 3f9d93b..0c0eacb 100644 --- a/mistraldashboard/workflows/views.py +++ b/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