Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some fixes in fr translation #760

Merged
merged 7 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions django_celery_beat/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from django.forms.widgets import Select
from django.template.defaultfilters import pluralize
from django.utils.translation import gettext_lazy as _
from django.utils.translation import ngettext_lazy
from kombu.utils.json import loads

from .models import (ClockedSchedule, CrontabSchedule, IntervalSchedule,
Expand Down Expand Up @@ -169,37 +170,35 @@ def get_queryset(self, request):
qs = super().get_queryset(request)
return qs.select_related('interval', 'crontab', 'solar', 'clocked')

def _message_user_about_update(self, request, rows_updated, verb):
"""Send message about action to user.

`verb` should shortly describe what have changed (e.g. 'enabled').

"""
self.message_user(
request,
_('{0} task{1} {2} successfully {3}').format(
rows_updated,
pluralize(rows_updated),
pluralize(rows_updated, _('was,were')),
verb,
),
)

@admin.action(
description=_('Enable selected tasks')
)
def enable_tasks(self, request, queryset):
rows_updated = queryset.update(enabled=True)
PeriodicTasks.update_changed()
self._message_user_about_update(request, rows_updated, 'enabled')
self.message_user(
request,
ngettext_lazy(
'{0} task was successfully enabled',
'{0} tasks were successfully enabled',
rows_updated
).format(rows_updated)
)

@admin.action(
description=_('Disable selected tasks')
)
def disable_tasks(self, request, queryset):
rows_updated = queryset.update(enabled=False, last_run_at=None)
PeriodicTasks.update_changed()
self._message_user_about_update(request, rows_updated, 'disabled')
self.message_user(
request,
ngettext_lazy(
'{0} task was successfully disabled',
'{0} tasks were successfully disabled',
rows_updated
).format(rows_updated)
)

def _toggle_tasks_activity(self, queryset):
return queryset.update(enabled=Case(
Expand All @@ -213,7 +212,14 @@ def _toggle_tasks_activity(self, queryset):
def toggle_tasks(self, request, queryset):
rows_updated = self._toggle_tasks_activity(queryset)
PeriodicTasks.update_changed()
self._message_user_about_update(request, rows_updated, 'toggled')
self.message_user(
request,
ngettext_lazy(
'{0} task was successfully toggled',
'{0} tasks were successfully toggled',
rows_updated
).format(rows_updated)
)

@admin.action(
description=_('Run selected tasks')
Expand Down
Binary file modified django_celery_beat/locale/fr/LC_MESSAGES/django.mo
Binary file not shown.
Loading