Skip to content

Commit 12e5166

Browse files
some fixes in fr translation (#760)
* some fixes in fr translation * compile fr translations * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * don't extract the verb from the translation string * fix plural * remove a fuzzy and fix the PO creation date * compilemessages fr --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent d79868e commit 12e5166

File tree

4 files changed

+183
-173
lines changed

4 files changed

+183
-173
lines changed

django_celery_beat/admin.py

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from django.forms.widgets import Select
99
from django.template.defaultfilters import pluralize
1010
from django.utils.translation import gettext_lazy as _
11+
from django.utils.translation import ngettext_lazy
1112
from kombu.utils.json import loads
1213

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

172-
def _message_user_about_update(self, request, rows_updated, verb):
173-
"""Send message about action to user.
174-
175-
`verb` should shortly describe what have changed (e.g. 'enabled').
176-
177-
"""
178-
self.message_user(
179-
request,
180-
_('{0} task{1} {2} successfully {3}').format(
181-
rows_updated,
182-
pluralize(rows_updated),
183-
pluralize(rows_updated, _('was,were')),
184-
verb,
185-
),
186-
)
187-
188173
@admin.action(
189174
description=_('Enable selected tasks')
190175
)
191176
def enable_tasks(self, request, queryset):
192177
rows_updated = queryset.update(enabled=True)
193178
PeriodicTasks.update_changed()
194-
self._message_user_about_update(request, rows_updated, 'enabled')
179+
self.message_user(
180+
request,
181+
ngettext_lazy(
182+
'{0} task was successfully enabled',
183+
'{0} tasks were successfully enabled',
184+
rows_updated
185+
).format(rows_updated)
186+
)
195187

196188
@admin.action(
197189
description=_('Disable selected tasks')
198190
)
199191
def disable_tasks(self, request, queryset):
200192
rows_updated = queryset.update(enabled=False, last_run_at=None)
201193
PeriodicTasks.update_changed()
202-
self._message_user_about_update(request, rows_updated, 'disabled')
194+
self.message_user(
195+
request,
196+
ngettext_lazy(
197+
'{0} task was successfully disabled',
198+
'{0} tasks were successfully disabled',
199+
rows_updated
200+
).format(rows_updated)
201+
)
203202

204203
def _toggle_tasks_activity(self, queryset):
205204
return queryset.update(enabled=Case(
@@ -213,7 +212,14 @@ def _toggle_tasks_activity(self, queryset):
213212
def toggle_tasks(self, request, queryset):
214213
rows_updated = self._toggle_tasks_activity(queryset)
215214
PeriodicTasks.update_changed()
216-
self._message_user_about_update(request, rows_updated, 'toggled')
215+
self.message_user(
216+
request,
217+
ngettext_lazy(
218+
'{0} task was successfully toggled',
219+
'{0} tasks were successfully toggled',
220+
rows_updated
221+
).format(rows_updated)
222+
)
217223

218224
@admin.action(
219225
description=_('Run selected tasks')
Binary file not shown.

0 commit comments

Comments
 (0)