From d2b2cc0521912b6726d2b9c7dc2a39ea9f7e23f7 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 29 Oct 2023 11:55:06 +1100 Subject: [PATCH] make options consistent in celery - changes 'broadcasts' to 'broadcast' in Celery page in admin section - re-orders celery queues on admin page to be in English alphabetical order (other than priority levels) - this makes them consistent with the Flower interface - fixes #3066 --- bookwyrm/templates/settings/celery.html | 2 +- bookwyrm/views/admin/celery_status.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/settings/celery.html b/bookwyrm/templates/settings/celery.html index 2f4a36ce9..b224e20cc 100644 --- a/bookwyrm/templates/settings/celery.html +++ b/bookwyrm/templates/settings/celery.html @@ -29,7 +29,7 @@
-

{% trans "Broadcasts" %}

+

{% trans "Broadcast" %}

{{ queues.broadcast|intcomma }}

diff --git a/bookwyrm/views/admin/celery_status.py b/bookwyrm/views/admin/celery_status.py index cd8b85b6d..dbf18dac8 100644 --- a/bookwyrm/views/admin/celery_status.py +++ b/bookwyrm/views/admin/celery_status.py @@ -110,20 +110,20 @@ class ClearCeleryForm(forms.Form): queues = forms.MultipleChoiceField( label="Queues", choices=[ - (LOW, "Low prioirty"), + (LOW, "Low priority"), (MEDIUM, "Medium priority"), (HIGH, "High priority"), - (STREAMS, "Streams"), - (IMAGES, "Images"), - (SUGGESTED_USERS, "Suggested users"), - (EMAIL, "Email"), + (BROADCAST, "Broadcast"), (CONNECTORS, "Connectors"), - (LISTS, "Lists"), - (INBOX, "Inbox"), + (EMAIL, "Email"), + (IMAGES, "Images"), (IMPORTS, "Imports"), (IMPORT_TRIGGERED, "Import triggered"), - (BROADCAST, "Broadcasts"), + (INBOX, "Inbox"), + (LISTS, "Lists"), (MISC, "Misc"), + (STREAMS, "Streams"), + (SUGGESTED_USERS, "Suggested users"), ], widget=forms.CheckboxSelectMultiple, )