From aa5ffc10f624b8610dc294525f036edc777dec88 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Sat, 10 Aug 2024 11:23:17 -0400 Subject: [PATCH] More cleanup --- netbox/core/views.py | 4 ++-- netbox/dcim/views.py | 5 ++++- netbox/netbox/views/generic/bulk_views.py | 5 ++--- netbox/netbox/views/generic/feature_views.py | 12 +++++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/netbox/core/views.py b/netbox/core/views.py index ece59c835..2282ba987 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -78,7 +78,7 @@ class DataSourceSyncView(BaseObjectView): messages.success( request, - _("Queued job #{job_id} to sync {datasource}").format(job_id=job.pk, datasource=datasource) + _("Queued job #{id} to sync {datasource}").format(id=job.pk, datasource=datasource) ) return redirect(datasource.get_absolute_url()) @@ -438,7 +438,7 @@ class BackgroundTaskEnqueueView(BaseRQView): registry = ScheduledJobRegistry(queue.name, queue.connection) registry.remove(job) - messages.success(request, _('Job {job_id} has been enqueued.').format(job_id=job_id)) + messages.success(request, _('Job {id} has been enqueued.').format(id=job_id)) return redirect(reverse('core:background_task', args=[job_id])) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index bac88f5d1..b18ecdd5b 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -3498,7 +3498,10 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL device.vc_priority = None device.save() - msg = _('Removed {} from virtual chassis {}').format(device, device.virtual_chassis) + msg = _('Removed {device} from virtual chassis {chassis}').format( + device=device, + chassis=device.virtual_chassis + ) messages.success(request, msg) return redirect(self.get_return_url(request, device)) diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 452d4936e..bc6ace885 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -754,12 +754,11 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView): if self.queryset.filter(pk__in=renamed_pks).count() != len(selected_objects): raise PermissionsViolation - model_name = self.queryset.model._meta.verbose_name_plural messages.success( request, _("Renamed {count} {object_type}").format( count=len(selected_objects), - object_type=model_name + object_type=self.queryset.model._meta.verbose_name_plural ) ) return redirect(self.get_return_url(request)) @@ -875,7 +874,7 @@ class BulkDeleteView(GetReturnURLMixin, BaseMultiObjectView): if not table.rows: messages.warning( request, - _("No {object_type} were selected for deletion.").format(object_type=model._meta.verbose_name_plural) + _("No {object_type} were selected.").format(object_type=model._meta.verbose_name_plural) ) return redirect(self.get_return_url(request)) diff --git a/netbox/netbox/views/generic/feature_views.py b/netbox/netbox/views/generic/feature_views.py index 2e9abbdc1..240e8ca28 100644 --- a/netbox/netbox/views/generic/feature_views.py +++ b/netbox/netbox/views/generic/feature_views.py @@ -206,9 +206,9 @@ class ObjectSyncDataView(View): return redirect(obj.get_absolute_url()) obj.sync(save=True) - messages.success(request, _("Synchronized data for {name} {obj}.").format( - name=model._meta.verbose_name, - obj=obj + messages.success(request, _("Synchronized data for {object_type} {object}.").format( + object_type=model._meta.verbose_name, + object=obj )) return redirect(obj.get_absolute_url()) @@ -231,7 +231,9 @@ class BulkSyncDataView(GetReturnURLMixin, BaseMultiObjectView): for obj in selected_objects: obj.sync(save=True) - model_name = self.queryset.model._meta.verbose_name_plural - messages.success(request, _("Synced {len} {model_name}").format(len=len(selected_objects), model_name=model_name)) + messages.success(request, _("Synced {count} {object_type}").format( + count=len(selected_objects), + object_type=self.queryset.model._meta.verbose_name_plural + )) return redirect(self.get_return_url(request))