Release 1.4.4 (#37 )

Feat: Add biweekly and bimonthly and fix translations (#36 )
Fix baseconv/base62 deprecation warning for Django 5.x (#34 )
2026-09-15 21:47:53 +08:00 · 2022-11-13 01:06:19 +01:00 · 2022-11-13 01:00:11 +01:00 · 2022-11-09 00:41:12 +01:00 · 2022-11-07 17:47:05 +01:00 · 2022-11-07 17:29:29 +01:00
24 changed files with 1006 additions and 652 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,8 +22,11 @@ jobs:

      - name: Install dependencies
        run: |
-          python -m pip install -U pip setuptools poetry
-          python -m pip install poetry
+          apt-get update
+          apt-get -y install gettext
+          python -m pip install pip setuptools django poetry
+          # compile messages to get .mo files
+          django-admin compilemessages
      - name: Build and publish package
        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
        run: poetry --build --username=__token__ --password=${{ secrets.PYPI_TOKEN }} publish
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [ "3.8", "3.9", "3.10" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
        django: [ "3.2", "4.1" ]

    services:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,54 @@
 # Changelog

-## [Unreleased](https://github.com/koed00/django-q/tree/HEAD)
+## [Unreleased](https://github.com/GDay/django-q2/tree/HEAD)

-[Full Changelog](https://github.com/koed00/django-q/compare/v1.3.9...HEAD)
+## [v1.4.4](https://github.com/GDay/django-q2/tree/v1.4.4) (2022-11-13)
+
+**Merged pull requests:**
+
+- Fix: Deprecation warning for Django 5.x https://github.com/GDay/django-q2/pull/34
+- Feat: Add biweekly and bimonthly https://github.com/GDay/django-q2/pull/36 
+- Fix: Fix all translation strings and remove compiled https://github.com/GDay/django-q2/pull/36 
+
+## [v1.4.3](https://github.com/GDay/django-q2/tree/v1.4.3) (2022-11-07)
+
+**Merged pull requests:**
+
+- Fix: func reference in admin https://github.com/GDay/django-q2/pull/28
+- Add python 3.11 support and remove 3.7 (as it was never supported by this package anyway)
+
+## [v1.4.2](https://github.com/GDay/django-q2/tree/v1.4.2) (2022-10-22)
+
+**Merged pull requests:**
+
+- Make redis dependency optional and update boto3 #22
+
+## [v1.4.1](https://github.com/GDay/django-q2/tree/v1.4.1) (2022-10-21)
+
+**Merged pull requests:**
+
+- Fix typo configure.rst https://github.com/GDay/django-q2/pull/1
+- Update dependencies https://github.com/GDay/django-q2/pull/2
+- Show function name in log when running task https://github.com/GDay/django-q2/pull/3
+- Codecov -> Coveralls https://github.com/GDay/django-q2/pull/4
+- Fix: readthedocs config file https://github.com/GDay/django-q2/pull/5
+- Docs updates https://github.com/GDay/django-q2/pull/6
+- Feat: Release plan to pypi https://github.com/GDay/django-q2/pull/7
+- Feat: Turkish translations https://github.com/GDay/django-q2/pull/8
+- Fix: Connection issues with CONN_MAX_AGE > 0 https://github.com/GDay/django-q2/pull/9
+- Replace use of eval() by ast.parse() + ast.literal_eval() https://github.com/GDay/django-q2/pull/10
+- Admin improvements https://github.com/GDay/django-q2/pull/11
+- Save limit per group/func/name https://github.com/GDay/django-q2/pull/12
+- Use logger.hasHandlers() to setup fallback logging https://github.com/GDay/django-q2/pull/13
+- allow atomic on external db https://github.com/GDay/django-q2/pull/14
+- Fix install command and remove old warnings https://github.com/GDay/django-q2/pull/16
+- Remove arrow dependency https://github.com/GDay/django-q2/pull/17
+- Remove funding file, add docker/compose for development project and fix https://github.com/GDay/django-q2/pull/18
+- Fix unclear error when function is not called correctly https://github.com/GDay/django-q2/pull/19
+- Remove blessed dependency https://github.com/GDay/django-q2/pull/20
+- Release new version and docs fixes https://github.com/GDay/django-q2/pull/21
+
+## v1.4.0 

 **Closed issues:**

--- a/README.rst
+++ b/README.rst
@@ -22,13 +22,25 @@ Features
 -  Redis, IronMQ, SQS, MongoDB or ORM
 -  Rollbar and Sentry support

+Changes compared to the original Django-Q:
+
+- Dropped support for Disque (hasn't been updated in a long time)
+- Dropped Redis, Arrow and Blessed dependencies
+- Updated all current dependencies
+- Added tests for Django 4.x
+- Added Turkish language
+- Improved admin area
+- Fixed a lot of issues
+
+See the `changelog <https://github.com/GDay/django-q2/blob/master/CHANGELOG.md>`__ for all changes.
+
 Requirements
 ~~~~~~~~~~~~

 -  `Django <https://www.djangoproject.com>`__ > = 3.2
 -  `Django-picklefield <https://github.com/gintas/django-picklefield>`__

-Tested with: Python 3.7, 3.8, 3.9, 3.10 Django 3.2.X and 4.1.X
+Tested with: Python 3.8, 3.9, 3.10, 3.11 Django 3.2.X and 4.1.X

 Brokers
 ~~~~~~~
--- a/django_q/cluster.py
+++ b/django_q/cluster.py
@@ -1,6 +1,5 @@
 # Standard
 import ast
-import inspect
 import pydoc
 import signal
 import socket
@@ -44,7 +43,7 @@ from django_q.signals import post_execute, pre_execute
 from django_q.signing import BadSignature, SignedPackage
 from django_q.status import Stat, Status

-from .utils import add_months, add_years
+from .utils import add_months, add_years, get_func_repr


 class Cluster:
@@ -75,7 +74,7 @@ class Cluster:
            ),
        )
        self.sentinel.start()
-        logger.info(_(f"Q Cluster {self.name} starting."))
+        logger.info(_("Q Cluster %(name)s starting.") % {'name': self.name})
        while not self.start_event.is_set():
            sleep(0.1)
        return self.pid
@@ -83,10 +82,10 @@ class Cluster:
    def stop(self) -> bool:
        if not self.sentinel.is_alive():
            return False
-        logger.info(_(f"Q Cluster {self.name} stopping."))
+        logger.info(_("Q Cluster %(name)s stopping.") % {'name': self.name})
        self.stop_event.set()
        self.sentinel.join()
-        logger.info(_(f"Q Cluster {self.name} has stopped."))
+        logger.info(_("Q Cluster %(name)s has stopped.") % {'name': self.name})
        self.start_event = None
        self.stop_event = None
        return True
@@ -94,8 +93,8 @@ class Cluster:
    def sig_handler(self, signum, frame):
        logger.debug(
            _(
-                f'{current_process().name} got signal {Conf.SIGNAL_NAMES.get(signum, "UNKNOWN")}'
-            )
+                '%(name)s got signal %(signal)s'
+            ) % {'name': current_process().name, 'signal': Conf.SIGNAL_NAMES.get(signum, "UNKNOWN")}
        )
        self.stop()

@@ -217,21 +216,21 @@ class Sentinel:
            db.connections.close_all()
        if process == self.monitor:
            self.monitor = self.spawn_monitor()
-            logger.error(_(f"reincarnated monitor {process.name} after sudden death"))
+            logger.error(_("reincarnated monitor %(name)s after sudden death") % {'name': process.name})
        elif process == self.pusher:
            self.pusher = self.spawn_pusher()
-            logger.error(_(f"reincarnated pusher {process.name} after sudden death"))
+            logger.error(_("reincarnated pusher %(name)s after sudden death") % {'name': process.name})
        else:
            self.pool.remove(process)
            self.spawn_worker()
            if process.timer.value == 0:
                # only need to terminate on timeout, otherwise we risk destabilizing the queues
                process.terminate()
-                logger.warning(_(f"reincarnated worker {process.name} after timeout"))
+                logger.warning(_("reincarnated worker %(name)s after timeout") % {'name': process.name})
            elif int(process.timer.value) == -2:
-                logger.info(_(f"recycled worker {process.name}"))
+                logger.info(_("recycled worker %(name)s") % {'name': process.name})
            else:
-                logger.error(_(f"reincarnated worker {process.name} after death"))
+                logger.error(_("reincarnated worker %(name)s after death") % {'name': process.name})

        self.reincarnations += 1

@@ -254,12 +253,12 @@ class Sentinel:
    def guard(self):
        logger.info(
            _(
-                f"{current_process().name} guarding cluster {humanize(self.cluster_id.hex)}"
-            )
+                "%(name)s guarding cluster %(cluster_name)s"
+                ) % {'name': current_process().name, 'cluster_name': humanize(self.cluster_id.hex)}
        )
        self.start_event.set()
        Stat(self).save()
-        logger.info(_(f"Q Cluster {humanize(self.cluster_id.hex)} running."))
+        logger.info(_("Q Cluster %(cluster_name)s running.") % {'cluster_name': humanize(self.cluster_id.hex)})
        counter = 0
        cycle = Conf.GUARD_CYCLE  # guard loop sleep in seconds
        # Guard loop. Runs at least once
@@ -293,7 +292,7 @@ class Sentinel:
    def stop(self):
        Stat(self).save()
        name = current_process().name
-        logger.info(_(f"{name} stopping cluster processes"))
+        logger.info(_("%(name)s stopping cluster processes") % {'name': name})
        # Stopping pusher
        self.event_out.set()
        # Wait for it to stop
@@ -318,7 +317,7 @@ class Sentinel:
        self.result_queue.close()
        # Wait for the result queue to empty
        self.result_queue.join_thread()
-        logger.info(_(f"{name} waiting for the monitor."))
+        logger.info(_("%(name)s waiting for the monitor.") % {'name': name})
        # Wait for everything to close or time out
        count = 0
        if not self.timeout:
@@ -340,7 +339,7 @@ def pusher(task_queue: Queue, event: Event, broker: Broker = None):
    """
    if not broker:
        broker = get_broker()
-    logger.info(_(f"{current_process().name} pushing tasks at {current_process().pid}"))
+    logger.info(_("%(process_name)s pushing tasks at %(id)s") % {'process_name': current_process().name, 'id': current_process().pid})
    while True:
        try:
            task_set = broker.dequeue()
@@ -361,10 +360,10 @@ def pusher(task_queue: Queue, event: Event, broker: Broker = None):
                    continue
                task["ack_id"] = ack_id
                task_queue.put(task)
-            logger.debug(_(f"queueing from {broker.list_key}"))
+            logger.debug(_("queueing from %(list_key)s") % {'list_key': broker.list_key})
        if event.is_set():
            break
-    logger.info(_(f"{current_process().name} stopped pushing tasks"))
+    logger.info(_("%(name)s stopped pushing tasks") % {'name': current_process().name})


 def monitor(result_queue: Queue, broker: Broker = None):
@@ -376,7 +375,7 @@ def monitor(result_queue: Queue, broker: Broker = None):
    if not broker:
        broker = get_broker()
    name = current_process().name
-    logger.info(_(f"{name} monitoring at {current_process().pid}"))
+    logger.info(_("%(name)s monitoring at %(id)s") % {'name': name, 'id': current_process().pid})
    for task in iter(result_queue.get, "STOP"):
        # save the result
        if task.get("cached", False):
@@ -393,11 +392,11 @@ def monitor(result_queue: Queue, broker: Broker = None):
        info_name = get_func_repr(task['func'])
        if task["success"]:
            # log success
-            logger.info(_(f"Processed '{info_name}' ({task['name']})"))
+            logger.info(_("Processed '%(info_name)s' (%(task_name)s)") % {'info_name': info_name, 'task_name': task['name']})
        else:
            # log failure
-            logger.error(_(f"Failed '{info_name}' ({task['name']}) - {task['result']}"))
-    logger.info(_(f"{name} stopped monitoring results"))
+            logger.error(_("Failed '%(info_name)s' (%(task_name)s) - %(task_result)s") % {'info_name': info_name, 'task_name': task['name'], 'task_result': task['result']})
+    logger.info(_("%(name)s stopped monitoring results") % {'name': name})


 def worker(
@@ -411,7 +410,7 @@ def worker(
    :type timer: multiprocessing.Value
    """
    proc_name = current_process().name
-    logger.info(_(f"{proc_name} ready for work at {current_process().pid}"))
+    logger.info(_("%(proc_name)s ready for work at %(id)s") % {'proc_name': proc_name, 'id': current_process().pid})
    task_count = 0
    if timeout is None:
        timeout = -1
@@ -423,7 +422,7 @@ def worker(
        # Get the function from the task
        func = task["func"]
        func_name = get_func_repr(func)
-        logger.info(_(f"{proc_name} processing '{func_name}' ({task['name']})"))
+        logger.info(_("%(proc_name)s processing '%(func_name)s' (%(task_name)s)") % {'proc_name': proc_name, 'func_name': func_name, 'task_name': task['name']})
        f = task["func"]
        # if it's not an instance try to get it from the string
        if not callable(task["func"]):
@@ -438,7 +437,7 @@ def worker(
            res = f(*task["args"], **task["kwargs"])
            result = (res, True)
        except Exception:
-            result = (f"Could not process '{func_name}'. Check the location of the function and the args/kwargs.", False)
+            result = (_("Could not process '%(func_name)s'. Check the location of the function and the args/kwargs.") % {'func_name': func_name}, False)
            if error_reporter:
                error_reporter.report()
            if task.get("sync", False):
@@ -454,19 +453,7 @@ def worker(
            if task_count == Conf.RECYCLE or rss_check():
                timer.value = -2  # Recycled
                break
-    logger.info(_(f"{proc_name} stopped doing work"))
-
-def get_func_repr(func):
-    # convert func to string
-    if inspect.isfunction(func):
-        return f"{func.__module__}.{func.__name__}"
-    elif inspect.ismethod(func) and hasattr(func.__self__, '__name__'):
-        return (
-            f"{func.__self__.__module__}."
-            f"{func.__self__.__name__}.{func.__name__}"
-        )
-    else:
-        return str(func)
+    logger.info(_("%(proc_name)s stopped doing work") % {'proc_name': proc_name})

 def save_task(task, broker: Broker):
    """
@@ -645,8 +632,12 @@ def scheduler(broker: Broker = None):
                            next_run = next_run + timedelta(days=1)
                        elif s.schedule_type == s.WEEKLY:
                            next_run = next_run + timedelta(weeks=1)
+                        elif s.schedule_type == s.BIWEEKLY:
+                            next_run = next_run + timedelta(weeks=2)
                        elif s.schedule_type == s.MONTHLY:
                            next_run = add_months(next_run, 1)
+                        elif s.schedule_type == s.BIMONTHLY:
+                            next_run = add_months(next_run, 2)
                        elif s.schedule_type == s.QUARTERLY:
                            next_run = add_months(next_run, 3)
                        elif s.schedule_type == s.YEARLY:
@@ -678,14 +669,14 @@ def scheduler(broker: Broker = None):
                if not s.task:
                    logger.error(
                        _(
-                            f"{current_process().name} failed to create a task from schedule [{s.name or s.id}]"
-                        )
+                            "%(process_name)s failed to create a task from schedule [%(schedule)s]"
+                        ) % {'process_name': current_process().name, 'schedule': s.name or s.id}
                    )
                else:
                    logger.info(
                        _(
-                            f"{current_process().name} created a task from schedule [{s.name or s.id}]"
-                        )
+                            "%(process_name)s created a task from schedule [%(schedule)s]"
+                        ) % {'process_name': current_process().name, 'schedule': s.name or s.id}
                    )
                # default behavior is to delete a ONCE schedule
                if s.schedule_type == s.ONCE:
@@ -724,12 +715,12 @@ def set_cpu_affinity(n: int, process_ids: list, actual: bool = not Conf.TESTING)
    """
    # check if we have the psutil module
    if not psutil:
-        logger.warning("Skipping cpu affinity because psutil was not found.")
+        logger.warning(_("Skipping cpu affinity because psutil was not found."))
        return
    # check if the platform supports cpu_affinity
    if actual and not hasattr(psutil.Process(process_ids[0]), "cpu_affinity"):
        logger.warning(
-            "Faking cpu affinity because it is not supported on this platform"
+            _("Faking cpu affinity because it is not supported on this platform")
        )
        actual = False
    # get the available processors
@@ -750,7 +741,7 @@ def set_cpu_affinity(n: int, process_ids: list, actual: bool = not Conf.TESTING)
            p = psutil.Process(pid)
            if actual:
                p.cpu_affinity(affinity)
-            logger.info(_(f"{pid} will use cpu {affinity}"))
+            logger.info(_("%(pid)s will use cpu %(affinity)s") % {'pid': pid, 'affinity': affinity})


 def rss_check():
--- a/django_q/conf.py
+++ b/django_q/conf.py
@@ -82,7 +82,7 @@ class Conf:

    # Verify SAVE_LIMIT_PER is valid
    if SAVE_LIMIT_PER not in ["group", "name", "func", None]:
-        warn(f"SAVE_LIMIT_PER ({SAVE_LIMIT_PER}) is not a valid option. Options are: 'group', 'name', 'func' and None. Default is None.")
+        warn(_("SAVE_LIMIT_PER (%(option)s) is not a valid option. Options are: 'group', 'name', 'func' and None. Default is None.") % {'option': SAVE_LIMIT_PER})

    # Guard loop sleep in seconds. Should be between 0 and 60 seconds.
    GUARD_CYCLE = conf.get("guard_cycle", 0.5)
--- a/django_q/core_signing.py
+++ b/django_q/core_signing.py
@@ -6,7 +6,11 @@ from django.core.signing import BadSignature, JSONSerializer, SignatureExpired
 from django.core.signing import Signer as Sgnr
 from django.core.signing import TimestampSigner as TsS
 from django.core.signing import b64_decode, dumps
-from django.utils import baseconv
+try:
+    from django.core.signing import base62
+except ImportError:
+    # For django < 4.0
+    from django.utils.baseconv import base62
 from django.utils.crypto import constant_time_compare
 from django.utils.encoding import force_bytes, force_str

@@ -69,7 +73,7 @@ class TimestampSigner(Signer, TsS):
        """
        result = super(TimestampSigner, self).unsign(value)
        value, timestamp = result.rsplit(self.sep, 1)
-        timestamp = baseconv.base62.decode(timestamp)
+        timestamp = base62.decode(timestamp)
        if max_age is not None:
            if isinstance(max_age, datetime.timedelta):
                max_age = max_age.total_seconds()
--- a/django_q/locale/de/LC_MESSAGES/django.mo
+++ b/django_q/locale/de/LC_MESSAGES/django.mo
--- a/django_q/locale/de/LC_MESSAGES/django.po
+++ b/django_q/locale/de/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-15 15:53+0100\n"
+"POT-Creation-Date: 2022-11-12 01:47+0000\n"
 "PO-Revision-Date: 2018-08-05 18:28+0200\n"
 "Last-Translator: Jonas Winkler\n"
 "Language-Team: \n"
@@ -17,431 +17,471 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: admin.py:40
+#: django_q/admin.py:43
 msgid "Resubmit selected tasks to queue"
 msgstr "Ausgewählte Aufgaben erneut ausführen"

-#: brokers/disque.py:59
-msgid "No Disque nodes configured"
-msgstr "Keine Disque-Knoten konfiguriert"
+#: django_q/admin.py:98 django_q/models.py:228
+#, fuzzy
+#| msgid "Success"
+msgid "success"
+msgstr "erfolg"

-#: brokers/disque.py:76
-msgid "Could not connect to any Disque nodes"
-msgstr "Konnte zu keinem Disque-Knoten verbinden"
+#: django_q/admin.py:109 django_q/models.py:230
+msgid "last_run"
+msgstr ""

-#: cluster.py:76
-#, fuzzy, python-brace-format
-#| msgid "Q Cluster-{} starting."
-msgid "Q Cluster {self.name} starting."
-msgstr "Q-Cluster {self.name} wird gestartet."
+#: django_q/cluster.py:77
+#, python-format
+msgid "Q Cluster %(name)s starting."
+msgstr "Q-Cluster %(name)s wird gestartet."

-#: cluster.py:84
-#, fuzzy, python-brace-format
+#: django_q/cluster.py:85
+#, fuzzy, python-format
 #| msgid "Q Cluster-{} stopping."
-msgid "Q Cluster {self.name} stopping."
-msgstr "Q-Cluster {self.name} wird gestoppt."
+msgid "Q Cluster %(name)s stopping."
+msgstr "Q-Cluster {name} wird gestoppt."

-#: cluster.py:87
-#, fuzzy, python-brace-format
-#| msgid "Q Cluster-{} has stopped."
-msgid "Q Cluster {self.name} has stopped."
-msgstr "Q-Cluster {self.name} wurde gestoppt."
+#: django_q/cluster.py:88
+#, python-format
+msgid "Q Cluster %(name)s has stopped."
+msgstr "Q-Cluster %(name)s wurde gestoppt."

-#: cluster.py:95
+#: django_q/cluster.py:96
+#, python-format
+msgid "%(name)s got signal %(signal)s"
+msgstr "%(name)s erhielt das Signal %(signal)s"
+
+#: django_q/cluster.py:219
+#, python-format
+msgid "reincarnated monitor %(name)s after sudden death"
+msgstr "Monitor %(name)s wurde nach unerwartetem Absturz neu gestartet"
+
+#: django_q/cluster.py:222
+#, python-format
+msgid "reincarnated pusher %(name)s after sudden death"
+msgstr "Pusher %(name)s wurde nach unerwartetem Absturz neu gestartet"
+
+#: django_q/cluster.py:229
+#, python-format
+msgid "reincarnated worker %(name)s after timeout"
+msgstr "Worker %(name)s wurde nach Zeitüberschreitung neu gestartet"
+
+#: django_q/cluster.py:231
+#, python-format
+msgid "recycled worker %(name)s"
+msgstr "Worker %(name)s wurde wiederverwendet"
+
+#: django_q/cluster.py:233
+#, python-format
+msgid "reincarnated worker %(name)s after death"
+msgstr "Worker %(name)s wurde nach unerwartetem Absturz neu gestartet"
+
+#: django_q/cluster.py:256
+#, python-format
+msgid "%(name)s guarding cluster %(cluster_name)s"
+msgstr "%(name)s beschützt das Cluster %(cluster_name)s"
+
+#: django_q/cluster.py:261
+#, python-format
+msgid "Q Cluster %(cluster_name)s running."
+msgstr "Q-Cluster %(cluster_name)s läuft."
+
+#: django_q/cluster.py:295
+#, python-format
+msgid "%(name)s stopping cluster processes"
+msgstr "%(name)s hält Cluster-Prozesse an"
+
+#: django_q/cluster.py:320
+#, python-format
+msgid "%(name)s waiting for the monitor."
+msgstr "%(name)s wartet auf den Monitor."
+
+#: django_q/cluster.py:342
+#, python-format
+msgid "%(process_name)s pushing tasks at %(id)s"
+msgstr "%(process_name)s veröffentlicht Aufagaben auf %(id)s"
+
+#: django_q/cluster.py:363
+#, python-format
+msgid "queueing from %(list_key)s"
+msgstr "Einreihen von %(list_key)s"
+
+#: django_q/cluster.py:366
+#, python-format
+msgid "%(name)s stopped pushing tasks"
+msgstr "%(name)s veröffentlicht keine Aufgaben mehr"
+
+#: django_q/cluster.py:378
+#, python-format
+msgid "%(name)s monitoring at %(id)s"
+msgstr "%(name)s beobachtet auf %(id)s"
+
+#: django_q/cluster.py:395
+#, python-format
+msgid "Processed '%(info_name)s' (%(task_name)s)"
+msgstr "[%(task_name)s] - '%(info_name)s' wurde verarbeitet"
+
+#: django_q/cluster.py:398
+#, python-format
+msgid "Failed '%(info_name)s' (%(task_name)s) - %(task_result)s"
+msgstr "'%(info_name)s' (%(task_name)s) ist fehlgeschlagen - %(task_result)s"
+
+#: django_q/cluster.py:399
+#, python-format
+msgid "%(name)s stopped monitoring results"
+msgstr "%(name)s überwacht keine Ergebnisse mehr"
+
+#: django_q/cluster.py:413
+#, python-format
+msgid "%(proc_name)s ready for work at %(id)s"
+msgstr "%(proc_name)s ist bereit für Arbeit auf %(id)s"
+
+#: django_q/cluster.py:425
+#, python-format
+msgid "%(proc_name)s processing '%(func_name)s' (%(task_name)s)"
+msgstr "%(proc_name)s verarbeitet '%(func_name)s' (%(task_name)s)"
+
+#: django_q/cluster.py:440
+#, python-format
 msgid ""
-"{current_process().name} got signal {Conf.SIGNAL_NAMES.get(signum, \"UNKNOWN"
-"\")}"
+"Could not process '%(func_name)s'. Check the location of the function and "
+"the args/kwargs."
 msgstr ""
-"{current_process().name} erhielt das Signal {Conf.SIGNAL_NAMES.get(signum, "
-"\"UNKNOWN\")}"
+"Konnte '%(func_name)s' nicht verarbeiten. Überprüfen Sie den Ort der "
+"Funktion und die args/kwargs."

-#: cluster.py:216
-#, fuzzy, python-brace-format
-#| msgid "reincarnated monitor {} after sudden death"
-msgid "reincarnated monitor {process.name} after sudden death"
-msgstr "Monitor {process.name} wurde nach unerwartetem Absturz neu gestartet"
+#: django_q/cluster.py:456
+#, python-format
+msgid "%(proc_name)s stopped doing work"
+msgstr "%(proc_name)s hat die Arbeit beendet"

-#: cluster.py:219
-#, fuzzy, python-brace-format
-#| msgid "reincarnated pusher {} after sudden death"
-msgid "reincarnated pusher {process.name} after sudden death"
-msgstr "Pusher {process.name} wurde nach unerwartetem Absturz neu gestartet"
-
-#: cluster.py:226
-#, fuzzy, python-brace-format
-#| msgid "reincarnated worker {} after timeout"
-msgid "reincarnated worker {process.name} after timeout"
-msgstr "Worker {process.name} wurde nach Zeitüberschreitung neu gestartet"
-
-#: cluster.py:228
-#, fuzzy, python-brace-format
-#| msgid "recycled worker {}"
-msgid "recycled worker {process.name}"
-msgstr "Worker {process.name} wurde wiederverwendet"
-
-#: cluster.py:230
-#, fuzzy, python-brace-format
-#| msgid "reincarnated worker {} after death"
-msgid "reincarnated worker {process.name} after death"
-msgstr "Worker {process.name} wurde nach unerwartetem Absturz neu gestartet"
-
-#: cluster.py:251
-msgid ""
-"{current_process().name} guarding cluster {humanize(self.cluster_id.hex)}"
-msgstr ""
-"{current_process().name} beschützt das Cluster {humanize(self.cluster_id."
-"hex)}"
-
-#: cluster.py:256
-msgid "Q Cluster {humanize(self.cluster_id.hex)} running."
-msgstr "Q-Cluster {humanize(self.cluster_id.hex)} ist bereit."
-
-#: cluster.py:290
-#, fuzzy, python-brace-format
-#| msgid "{} stopping cluster processes"
-msgid "{name} stopping cluster processes"
-msgstr "{name} hält Cluster-Prozesse an"
-
-#: cluster.py:315
-#, fuzzy, python-brace-format
-#| msgid "{} waiting for the monitor."
-msgid "{name} waiting for the monitor."
-msgstr "{name} wartet auf den Monitor."
-
-#: cluster.py:337
-msgid "{current_process().name} pushing tasks at {current_process().pid}"
-msgstr ""
-"{current_process().name} veröffentlicht Aufagaben auf {current_process().pid}"
-
-#: cluster.py:358
-#, fuzzy, python-brace-format
-#| msgid "queueing from {}"
-msgid "queueing from {broker.list_key}"
-msgstr "Einreihen von {broker.list_key}"
-
-#: cluster.py:361
-#, fuzzy
-#| msgid "{} stopped pushing tasks"
-msgid "{current_process().name} stopped pushing tasks"
-msgstr "{current_process().name} veröffentlicht keine Aufgaben mehr"
-
-#: cluster.py:373
-#, fuzzy
-#| msgid "{} monitoring at {}"
-msgid "{name} monitoring at {current_process().pid}"
-msgstr "{name} beobachtet auf {current_process().pid}"
-
-#: cluster.py:387
-#, fuzzy
-#| msgid "Processed [{}]"
-msgid "Processed [{task['name']}]"
-msgstr "[{task['name']}] wurde verarbeitet"
-
-#: cluster.py:390
-msgid "Failed [{task['name']}] - {task['result']}"
-msgstr "[{task['name']}] ist fehlgeschlagen - {task['result']}"
-
-#: cluster.py:391
-#, fuzzy, python-brace-format
-#| msgid "{} stopped monitoring results"
-msgid "{name} stopped monitoring results"
-msgstr "{name} überwacht keine Ergebnisse mehr"
-
-#: cluster.py:405
-#, fuzzy
-#| msgid "{} ready for work at {}"
-msgid "{name} ready for work at {current_process().pid}"
-msgstr "{name} ist bereit für Arbeit auf {current_process().pid}"
-
-#: cluster.py:415
-#, fuzzy
-#| msgid "{} processing [{}]"
-msgid "{name} processing [{task[\"name\"]}]"
-msgstr "{name} verarbeitet [{task[\"name\"]}]"
-
-#: cluster.py:455
-#, fuzzy, python-brace-format
-#| msgid "{} stopped doing work"
-msgid "{name} stopped doing work"
-msgstr "{name} hat die Arbeit beendet"
-
-#: cluster.py:619 models.py:143
+#: django_q/cluster.py:649 django_q/models.py:144
 msgid "Please install croniter to enable cron expressions"
 msgstr "Bitte installieren Sie croniter, um Cron-Ausdrücke zu aktivieren"

-#: cluster.py:644
-#, fuzzy
-#| msgid "{} failed to create a task from schedule [{}]"
-msgid ""
-"{current_process().name} failed to create a task from schedule [{s.name or s."
-"id}]"
+#: django_q/cluster.py:672
+#, python-format
+msgid "%(process_name)s failed to create a task from schedule [%(schedule)s]"
 msgstr ""
-"{current_process().name} konnte keine Aufgabe von Zeitplan [{s.name or s."
-"id}] erstellen"
+"%(process_name)s konnte keine Aufgabe von Zeitplan [%(schedule)s] erstellen"

-#: cluster.py:650
-#, fuzzy
-#| msgid "{} created a task from schedule [{}]"
-msgid ""
-"{current_process().name} created a task from schedule [{s.name or s.id}]"
+#: django_q/cluster.py:678
+#, python-format
+msgid "%(process_name)s created a task from schedule [%(schedule)s]"
 msgstr ""
-"{current_process().name} hat eine Aufgabe des Zeitplans [{s.name or s.id}] "
-"erstellt"
+"%(process_name)s hat eine Aufgabe des Zeitplans [%(schedule)s] erstellt"

-#: cluster.py:716
-#, fuzzy, python-brace-format
-#| msgid "{} will use cpu {}"
-msgid "{pid} will use cpu {affinity}"
-msgstr "{pid} wird CPU {affinity} benutzen"
+#: django_q/cluster.py:718
+msgid "Skipping cpu affinity because psutil was not found."
+msgstr "Cpu-Affinität wird übersprungen, da psutil nicht gefunden wurde."
+
+#: django_q/cluster.py:723
+msgid "Faking cpu affinity because it is not supported on this platform"
+msgstr ""
+"Vortäuschen von CPU-Affinität, da diese auf dieser Plattform nicht "
+"unterstützt wird"
+
+#: django_q/cluster.py:744
+#, python-format
+msgid "%(pid)s will use cpu %(affinity)s"
+msgstr "%(pid)s wird CPU %(affinity)s benutzen"
+
+#: django_q/conf.py:85
+#, python-format
+msgid ""
+"SAVE_LIMIT_PER (%(option)s) is not a valid option. Options are: 'group', "
+"'name', 'func' and None. Default is None."
+msgstr ""
+"SAVE_LIMIT_PER (%(option)s) ist keine gültige Option. Optionen sind: "
+"'group', 'name', 'func' und None. Standard ist None."

 #. Translators: Cluster status descriptions
-#: conf.py:184
+#: django_q/conf.py:194
 msgid "Starting"
 msgstr "Wird gestartet"

-#: conf.py:185
+#: django_q/conf.py:195
 msgid "Working"
 msgstr "Arbeitet"

-#: conf.py:186
+#: django_q/conf.py:196
 msgid "Idle"
 msgstr "Leerlauf"

-#: conf.py:187
+#: django_q/conf.py:197
 msgid "Stopped"
 msgstr "Gestoppt"

-#: conf.py:188
+#: django_q/conf.py:198
 msgid "Stopping"
 msgstr "Wird gestoppt"

 #. Translators: help text for qcluster management command
-#: management/commands/qcluster.py:9
+#: django_q/management/commands/qcluster.py:9
 msgid "Starts a Django Q Cluster."
 msgstr "Startet ein Django-Q-Cluster."

 #. Translators: help text for qinfo management command
-#: management/commands/qinfo.py:11
+#: django_q/management/commands/qinfo.py:11
 msgid "General information over all clusters."
 msgstr "Allgemeine Informationen über alle Cluster"

+#. Translators: help text for qmemory management command
+#: django_q/management/commands/qmemory.py:9
+msgid "Monitors Q Cluster memory usage"
+msgstr "Überwacht die Speichernutzung von Q Cluster"
+
 #. Translators: help text for qmonitor management command
-#: management/commands/qmonitor.py:9
+#: django_q/management/commands/qmonitor.py:9
 msgid "Monitors Q Cluster activity"
 msgstr "Q-Cluster aktiv überwachen"

-#: models.py:118
+#: django_q/models.py:119
 msgid "Successful task"
 msgstr "Erfolgreiche Aufgabe"

-#: models.py:119
+#: django_q/models.py:120
 msgid "Successful tasks"
 msgstr "Erfolgreiche Aufgaben"

-#: models.py:134
+#: django_q/models.py:135
 msgid "Failed task"
 msgstr "Fehlgeschlagene Aufgabe"

-#: models.py:135
+#: django_q/models.py:136
 msgid "Failed tasks"
 msgstr "Fehlgeschlagene Aufgaben"

-#: models.py:159
+#: django_q/models.py:160
 msgid "e.g. 1, 2, 'John'"
 msgstr "zum Beispiel 1, 2, 'John'"

-#: models.py:161
+#: django_q/models.py:162
 msgid "e.g. x=1, y=2, name='John'"
 msgstr "zum Beispiel x=1, y=2, name='John'"

-#: models.py:173
+#: django_q/models.py:176
 msgid "Once"
 msgstr "Einmal"

-#: models.py:174
+#: django_q/models.py:177
 msgid "Minutes"
 msgstr "Minuten"

-#: models.py:175
+#: django_q/models.py:178
 msgid "Hourly"
 msgstr "Stündlich"

-#: models.py:176
+#: django_q/models.py:179
 msgid "Daily"
 msgstr "Täglich"

-#: models.py:177
+#: django_q/models.py:180
 msgid "Weekly"
 msgstr "Wöchentlich"

-#: models.py:178
+#: django_q/models.py:181
+msgid "Biweekly"
+msgstr "Zweiwöchentlich"
+
+#: django_q/models.py:182
 msgid "Monthly"
 msgstr "Monatlich"

-#: models.py:179
+#: django_q/models.py:183
+msgid "Bimonthly"
+msgstr "Zweimonatlich"
+
+#: django_q/models.py:184
 msgid "Quarterly"
 msgstr "Vierteljährlich"

-#: models.py:180
+#: django_q/models.py:185
 msgid "Yearly"
 msgstr "Jährlich"

-#: models.py:181
+#: django_q/models.py:186
 msgid "Cron"
 msgstr "Cron"

-#: models.py:184
+#: django_q/models.py:189
 msgid "Schedule Type"
 msgstr "Zeitplan-Typ"

-#: models.py:187
+#: django_q/models.py:192
 msgid "Number of minutes for the Minutes type"
 msgstr "Anzahl Minuten für den Typ 'Minuten'"

-#: models.py:190
+#: django_q/models.py:195
 msgid "Repeats"
 msgstr "Wiederhohlungen"

-#: models.py:190
+#: django_q/models.py:195
 msgid "n = n times, -1 = forever"
 msgstr "n = n mal, -1 = für immer"

-#: models.py:193
+#: django_q/models.py:198
 msgid "Next Run"
 msgstr "Nächste Ausführung"

-#: models.py:200
+#: django_q/models.py:205
 msgid "Cron expression"
 msgstr "Cron-Ausdruck"

-#: models.py:226
+#: django_q/models.py:235
 msgid "Scheduled task"
 msgstr "Geplante Aufgabe"

-#: models.py:227
+#: django_q/models.py:236
 msgid "Scheduled tasks"
 msgstr "Geplante Aufgaben"

-#: models.py:250
+#: django_q/models.py:262
 msgid "Queued task"
 msgstr "Eingereihte Aufgabe"

-#: models.py:251
+#: django_q/models.py:263
 msgid "Queued tasks"
 msgstr "Eingereihte Aufgaben"

-#: monitor.py:35
+#: django_q/monitor.py:62 django_q/monitor.py:339
 msgid "Host"
 msgstr "Host"

-#: monitor.py:39
+#: django_q/monitor.py:66 django_q/monitor.py:343 django_q/monitor.py:450
 msgid "Id"
 msgstr "Id"

-#: monitor.py:43
+#: django_q/monitor.py:70
 msgid "State"
 msgstr "Status"

-#: monitor.py:47
+#: django_q/monitor.py:74
 msgid "Pool"
 msgstr "Pool"

-#: monitor.py:51
+#: django_q/monitor.py:78
 msgid "TQ"
 msgstr "TQ"

-#: monitor.py:55
+#: django_q/monitor.py:82
 msgid "RQ"
 msgstr "RQ"

-#: monitor.py:59
+#: django_q/monitor.py:86
 msgid "RC"
 msgstr "RC"

-#: monitor.py:63
+#: django_q/monitor.py:90
 msgid "Up"
 msgstr "Up"

-#: monitor.py:143 monitor.py:247
+#: django_q/monitor.py:170 django_q/monitor.py:279
 msgid "Queued"
 msgstr "Eingereiht"

-#: monitor.py:151
+#: django_q/monitor.py:178
 msgid "Success"
 msgstr "Erfolg"

-#: monitor.py:161 monitor.py:255
+#: django_q/monitor.py:188 django_q/monitor.py:287
 msgid "Failures"
 msgstr "Fehlschläge"

-#: monitor.py:172
+#: django_q/monitor.py:199 django_q/monitor.py:485
 msgid "[Press q to quit]"
 msgstr "[Drücken Sie q zum Beenden]"

-#: monitor.py:191
+#: django_q/monitor.py:223
 msgid "day"
 msgstr "Tag"

-#: monitor.py:212
+#: django_q/monitor.py:244
 msgid "second"
 msgstr "Sekunde"

-#: monitor.py:215
+#: django_q/monitor.py:247
 msgid "minute"
 msgstr "Minute"

-#: monitor.py:218
+#: django_q/monitor.py:250
 msgid "hour"
 msgstr "Stunde"

-#: monitor.py:228
-msgid ""
-"-- {Conf.PREFIX.capitalize()} { \".\".join(str(v) for v in VERSION)} on "
-"{broker.info()}  --"
-msgstr ""
-"-- {Conf.PREFIX.capitalize()} { \".\".join(str(v) for v in VERSION)} auf "
-"{broker.info()}  --"
+#: django_q/monitor.py:260
+#, python-format
+msgid "-- %(prefix)s %(version)s on %(info)s --"
+msgstr "-- %(prefix)s %(version)s auf %(info)s --"

-#: monitor.py:234
+#: django_q/monitor.py:266
 msgid "Clusters"
 msgstr "Cluster"

-#: monitor.py:238
+#: django_q/monitor.py:270
 msgid "Workers"
 msgstr "Arbeiter"

-#: monitor.py:242
+#: django_q/monitor.py:274
 msgid "Restarts"
 msgstr "Neustarts"

-#: monitor.py:251
+#: django_q/monitor.py:283
 msgid "Successes"
 msgstr "Erfolge"

-#: monitor.py:260
+#: django_q/monitor.py:292
 msgid "Schedules"
 msgstr "Zeitpläne"

-#: monitor.py:264
-#, fuzzy, python-brace-format
-#| msgid "Tasks/{}"
-msgid "Tasks/{per}"
-msgstr "Aufgaben/{per}"
+#: django_q/monitor.py:296
+#, python-format
+msgid "Tasks/%(per)s"
+msgstr "Aufgaben/%(per)s"

-#: monitor.py:268
+#: django_q/monitor.py:300
 msgid "Avg time"
 msgstr "Durchschnittl. Zeit"

-#: signals.py:22
-#, fuzzy, python-brace-format
-#| msgid "malformed return hook '{}' for [{}]"
-msgid "malformed return hook '{instance.hook}' for [{instance.name}]"
-msgstr "Ungültiger Return-Hook '{instance.hook}' für [{instance.name}]"
+#: django_q/monitor.py:348
+msgid "Available (%)"
+msgstr "Verfügbar (%)"

-#: signals.py:30
-#, fuzzy
-#| msgid "return hook {} failed on [{}] because {}"
-msgid ""
-"return hook {instance.hook} failed on [{instance.name}] because {str(e)}"
-msgstr ""
-"Return-Hook {instance.hook} für [{instance.name}] ist gescheitert: {str(e)}"
+#: django_q/monitor.py:354
+msgid "Available (MB)"
+msgstr "Verfügbar (MB)"
+
+#: django_q/monitor.py:359
+msgid "Total (MB)"
+msgstr "Insgesamt (MB)"
+
+#: django_q/monitor.py:364
+msgid "Sentinel (MB)"
+msgstr "Sentinel (MB)"
+
+#: django_q/monitor.py:370
+msgid "Monitor (MB)"
+msgstr "Monitor (MB)"
+
+#: django_q/monitor.py:376
+msgid "Workers (MB)"
+msgstr "Arbeiter (MB)"
+
+#: django_q/monitor.py:478
+#, python-format
+msgid "Available lowest (): %(memory_percent)s ((at)s)"
+msgstr "Niedrigste verfügbar (): %(memory_percent)s ((at)s)"
+
+#: django_q/monitor.py:496
+msgid "No clusters appear to be running."
+msgstr "Es scheinen keine Cluster zu laufen."
+
+#: django_q/signals.py:22
+#, python-format
+msgid "malformed return hook '%(hook)s' for [%(name)s]"
+msgstr "Ungültiger Return-Hook '%(hook)s' für [%(name)s]"
+
+#: django_q/signals.py:30
+#, python-format
+msgid "return hook %(hook)s failed on [%(name)s] because %(error)s"
+msgstr "Return-Hook %(hook)s für [%(name)s] ist gescheitert: %(error)s"
--- a/django_q/locale/fr/LC_MESSAGES/django.mo
+++ b/django_q/locale/fr/LC_MESSAGES/django.mo
--- a/django_q/locale/fr/LC_MESSAGES/django.po
+++ b/django_q/locale/fr/LC_MESSAGES/django.po
@@ -6,349 +6,489 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-05 15:48+0200\n"
+"POT-Creation-Date: 2022-11-12 01:47+0000\n"
 "PO-Revision-Date: 2018-08-05 18:28+0200\n"
+"Last-Translator: Thierry BOULOGNE <contact@tng-concepts.com>\n"
 "Language-Team: \n"
+"Language: fr-FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.1.1\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Last-Translator: Thierry BOULOGNE <contact@tng-concepts.com>\n"
-"Language: fr-FR\n"

-#: admin.py:48
+#: django_q/admin.py:43
 msgid "Resubmit selected tasks to queue"
 msgstr "Resoumettre les tâches sélectionnées à la file d'attente"

-#: cluster.py:54
-msgid "Q Cluster-{} starting."
-msgstr "Démarrage de Q Cluster-{}."
+#: django_q/admin.py:98 django_q/models.py:228
+#, fuzzy
+#| msgid "Success"
+msgid "success"
+msgstr "succès"

-#: cluster.py:62
-msgid "Q Cluster-{} stopping."
-msgstr "Arrêt de Q Cluster-{}."
+#: django_q/admin.py:109 django_q/models.py:230
+msgid "last_run"
+msgstr ""

-#: cluster.py:65
-msgid "Q Cluster-{} has stopped."
-msgstr "Q Cluster-{} a été arrêté."
+#: django_q/cluster.py:77
+#, python-format
+msgid "Q Cluster %(name)s starting."
+msgstr "Démarrage de Q Cluster-%(name)s."

-#: cluster.py:71
-msgid "{} got signal {}"
-msgstr "{} à reçu le signal {}"
+#: django_q/cluster.py:85
+#, python-format
+msgid "Q Cluster %(name)s stopping."
+msgstr "Arrêt de Q Cluster-%(name)s."

-#: cluster.py:169
-msgid "reincarnated monitor {} after sudden death"
-msgstr "moniteur réintégré {} après un arrêt intempestif"
+#: django_q/cluster.py:88
+#, python-format
+msgid "Q Cluster %(name)s has stopped."
+msgstr "Q Cluster-%(name)s a été arrêté."

-#: cluster.py:172
-msgid "reincarnated pusher {} after sudden death"
-msgstr "pousseur réintégré {} après un arrêt intempestif"
+#: django_q/cluster.py:96
+#, python-format
+msgid "%(name)s got signal %(signal)s"
+msgstr "%(name)s à reçu le signal %(signal)s"

-#: cluster.py:179
-msgid "reincarnated worker {} after timeout"
-msgstr "processus réintégré {} après un arrêt une attente trop longue"
+#: django_q/cluster.py:219
+#, python-format
+msgid "reincarnated monitor %(name)s after sudden death"
+msgstr "moniteur réintégré %(name)s après un arrêt intempestif"

-#: cluster.py:181
-msgid "recycled worker {}"
-msgstr "processus recyclé"
+#: django_q/cluster.py:222
+#, python-format
+msgid "reincarnated pusher %(name)s after sudden death"
+msgstr "pousseur réintégré %(name)s après un arrêt intempestif"

-#: cluster.py:183
-msgid "reincarnated worker {} after death"
-msgstr "processus réintégré {} après arrêt"
+#: django_q/cluster.py:229
+#, python-format
+msgid "reincarnated worker %(name)s after timeout"
+msgstr "processus réintégré %(name)s après un arrêt une attente trop longue"

-#: cluster.py:202
-msgid "{} guarding cluster at {}"
-msgstr "{} surveillance du cluster à {}"
+#: django_q/cluster.py:231
+#, python-format
+msgid "recycled worker %(name)s"
+msgstr "processus recyclé %(name)s"

-#: cluster.py:205
-msgid "Q Cluster-{} running."
-msgstr "Q Cluster-{} en cours d'exécution."
+#: django_q/cluster.py:233
+#, python-format
+msgid "reincarnated worker %(name)s after death"
+msgstr "processus réintégré %(name)s après arrêt"

-#: cluster.py:239
-msgid "{} stopping cluster processes"
-msgstr "{} arrêt des processus de cluster"
+#: django_q/cluster.py:256
+#, python-format
+msgid "%(name)s guarding cluster %(cluster_name)s"
+msgstr "%(name)s surveillance du cluster à %(cluster_name)s"

-#: cluster.py:264
-msgid "{} waiting for the monitor."
-msgstr "{} en attente du moniteur."
+#: django_q/cluster.py:261
+#, python-format
+msgid "Q Cluster %(cluster_name)s running."
+msgstr "Démarrage de Q Cluster-%(cluster_name)s."

-#: cluster.py:285
-msgid "{} pushing tasks at {}"
-msgstr "{} tâche envoyé à {}"
+#: django_q/cluster.py:295
+#, python-format
+msgid "%(name)s stopping cluster processes"
+msgstr "%(name)s arrêt des processus de cluster"

-#: cluster.py:306
-msgid "queueing from {}"
-msgstr "mise en file d'attente de {}"
+#: django_q/cluster.py:320
+#, python-format
+msgid "%(name)s waiting for the monitor."
+msgstr "%(name)s en attente du moniteur."

-#: cluster.py:309
-msgid "{} stopped pushing tasks"
-msgstr "{} a cessé de pousser les tâches"
+#: django_q/cluster.py:342
+#, python-format
+msgid "%(process_name)s pushing tasks at %(id)s"
+msgstr "%(process_name)s tâche envoyé à %(id)s"

-#: cluster.py:320
-msgid "{} monitoring at {}"
-msgstr "{} Surveillance de {}"
+#: django_q/cluster.py:363
+#, python-format
+msgid "queueing from %(list_key)s"
+msgstr "mise en file d'attente de %(list_key)s"

-#: cluster.py:334
-msgid "Processed [{}]"
-msgstr "Traitement de [{}]"
+#: django_q/cluster.py:366
+#, python-format
+msgid "%(name)s stopped pushing tasks"
+msgstr "%(name)s a cessé de pousser les tâches"

-#: cluster.py:337
-msgid "Failed [{}] - {}"
-msgstr "Echec [{}] - {}"
+#: django_q/cluster.py:378
+#, python-format
+msgid "%(name)s monitoring at %(id)s"
+msgstr "%(name)s Surveillance de %(id)s"

-#: cluster.py:338
-msgid "{} stopped monitoring results"
-msgstr "{} arrêt des résultats de surveillance"
+#: django_q/cluster.py:395
+#, python-format
+msgid "Processed '%(info_name)s' (%(task_name)s)"
+msgstr "traité '%(info_name)s' (%(task_name)s)"

-#: cluster.py:349
-msgid "{} ready for work at {}"
-msgstr "{} prêt pour le travail à {}"
+#: django_q/cluster.py:398
+#, python-format
+msgid "Failed '%(info_name)s' (%(task_name)s) - %(task_result)s"
+msgstr "Manqué '%(info_name)s' (%(task_name)s) - %(task_result)s"

-#: cluster.py:357
-msgid "{} processing [{}]"
-msgstr "{} en cours de traitement [{}]"
+#: django_q/cluster.py:399
+#, python-format
+msgid "%(name)s stopped monitoring results"
+msgstr "%(name)s arrêt des résultats de surveillance"

-#: cluster.py:398
-msgid "{} stopped doing work"
-msgstr "{} arrêté de travailler"
+#: django_q/cluster.py:413
+#, python-format
+msgid "%(proc_name)s ready for work at %(id)s"
+msgstr "%(proc_name)s prêt pour le travail à %(id)s"

-#: cluster.py:543
-msgid "{} failed to create a task from schedule [{}]"
-msgstr "{} Echec de la création d'une tâche à partir de Schedule [{}]"
+#: django_q/cluster.py:425
+#, python-format
+msgid "%(proc_name)s processing '%(func_name)s' (%(task_name)s)"
+msgstr "%(proc_name)s en traitement '%(func_name)s' (%(task_name)s)"

-#: cluster.py:547
-msgid "{} created a task from schedule [{}]"
-msgstr "{} a créé une tâche à partir de Schedule [{}]"
+#: django_q/cluster.py:440
+#, python-format
+msgid ""
+"Could not process '%(func_name)s'. Check the location of the function and "
+"the args/kwargs."
+msgstr ""
+"Impossible de traiter '%(func_name)s'. Vérifiez l'emplacement de la fonction "
+"et les args/kwargs."

-#: cluster.py:595
-msgid "{} will use cpu {}"
-msgstr "{} utilisera le CPU {}"
+#: django_q/cluster.py:456
+#, python-format
+msgid "%(proc_name)s stopped doing work"
+msgstr "%(proc_name)s arrêté de travailler"

-#: conf.py:169
+#: django_q/cluster.py:649 django_q/models.py:144
+msgid "Please install croniter to enable cron expressions"
+msgstr "Veuillez installer croniter pour activer les expressions croniques."
+
+#: django_q/cluster.py:672
+#, python-format
+msgid "%(process_name)s failed to create a task from schedule [%(schedule)s]"
+msgstr ""
+"%(process_name)s Echec de la création d'une tâche à partir de Schedule "
+"[%(schedule)s]"
+
+#: django_q/cluster.py:678
+#, python-format
+msgid "%(process_name)s created a task from schedule [%(schedule)s]"
+msgstr "%(process_name)s a créé une tâche à partir de Schedule [%(schedule)s]"
+
+#: django_q/cluster.py:718
+msgid "Skipping cpu affinity because psutil was not found."
+msgstr "Sauter l'affinité du processeur parce que psutil n'a pas été trouvé."
+
+#: django_q/cluster.py:723
+msgid "Faking cpu affinity because it is not supported on this platform"
+msgstr ""
+"Simulation de l'affinité du processeur parce qu'elle n'est pas supportée sur "
+"cette plateforme."
+
+#: django_q/cluster.py:744
+#, python-format
+msgid "%(pid)s will use cpu %(affinity)s"
+msgstr "%(pid)s utilisera le CPU %(affinity)s"
+
+#: django_q/conf.py:85
+#, python-format
+msgid ""
+"SAVE_LIMIT_PER (%(option)s) is not a valid option. Options are: 'group', "
+"'name', 'func' and None. Default is None."
+msgstr ""
+"SAVE_LIMIT_PER (%(option)s) n'est pas une option valide. Les options sont : "
+"'group', 'name', 'func' et None. La valeur par défaut est None."
+
+#. Translators: Cluster status descriptions
+#: django_q/conf.py:194
 msgid "Starting"
 msgstr "Démarrage"

-#: conf.py:170
+#: django_q/conf.py:195
 msgid "Working"
 msgstr "Actif"

-#: conf.py:171
+#: django_q/conf.py:196
 msgid "Idle"
 msgstr "En attente"

-#: conf.py:172
+#: django_q/conf.py:197
 msgid "Stopped"
 msgstr "Arrêté"

-#: conf.py:173
+#: django_q/conf.py:198
 msgid "Stopping"
 msgstr "En cours d’arrêt"

-#: management/commands/qcluster.py:9
+#. Translators: help text for qcluster management command
+#: django_q/management/commands/qcluster.py:9
 msgid "Starts a Django Q Cluster."
 msgstr "Démarre un cluster Django Q."

-#: management/commands/qinfo.py:11
+#. Translators: help text for qinfo management command
+#: django_q/management/commands/qinfo.py:11
 msgid "General information over all clusters."
 msgstr "Informations générales sur tous les clusters."

-#: management/commands/qmonitor.py:9
+#. Translators: help text for qmemory management command
+#: django_q/management/commands/qmemory.py:9
+#, fuzzy
+#| msgid "Monitors Q Cluster activity"
+msgid "Monitors Q Cluster memory usage"
+msgstr "Surveille l'utilisation de la mémoire du cluster Q"
+
+#. Translators: help text for qmonitor management command
+#: django_q/management/commands/qmonitor.py:9
 msgid "Monitors Q Cluster activity"
 msgstr "Activité du cluster Moniteur Q"

-#: models.py:104
+#: django_q/models.py:119
 msgid "Successful task"
 msgstr "Tâche réussie"

-#: models.py:105
+#: django_q/models.py:120
 msgid "Successful tasks"
 msgstr "Tâches réussies"

-#: models.py:121
+#: django_q/models.py:135
 msgid "Failed task"
 msgstr "Tâche échoué"

-#: models.py:122
+#: django_q/models.py:136
 msgid "Failed tasks"
 msgstr "Tâches échouées"

-#: models.py:131
+#: django_q/models.py:160
 msgid "e.g. 1, 2, 'John'"
 msgstr "ex. 1, 2, ‘Jean’"

-#: models.py:132
+#: django_q/models.py:162
 msgid "e.g. x=1, y=2, name='John'"
 msgstr "p. ex. x = 1, y = 2, Nom = ‘Jean’"

-#: models.py:142
+#: django_q/models.py:176
 msgid "Once"
 msgstr "Une fois"

-#: models.py:143
+#: django_q/models.py:177
 msgid "Minutes"
 msgstr "Minutes"

-#: models.py:144
+#: django_q/models.py:178
 msgid "Hourly"
 msgstr "Toutes les heures"

-#: models.py:145
+#: django_q/models.py:179
 msgid "Daily"
 msgstr "Quotidien"

-#: models.py:146
+#: django_q/models.py:180
 msgid "Weekly"
 msgstr "Hebdomadaire"

-#: models.py:147
+#: django_q/models.py:181
+#, fuzzy
+#| msgid "Weekly"
+msgid "Biweekly"
+msgstr "Bihebdomadaire"
+
+#: django_q/models.py:182
 msgid "Monthly"
 msgstr "Mensuel"

-#: models.py:148
+#: django_q/models.py:183
+#, fuzzy
+#| msgid "Monthly"
+msgid "Bimonthly"
+msgstr "Bimestriel"
+
+#: django_q/models.py:184
 msgid "Quarterly"
 msgstr "Tous les quart-d’heure"

-#: models.py:149
+#: django_q/models.py:185
 msgid "Yearly"
 msgstr "Annuel"

-#: models.py:151
+#: django_q/models.py:186
+msgid "Cron"
+msgstr "Cron"
+
+#: django_q/models.py:189
 msgid "Schedule Type"
 msgstr "Type de plannification"

-#: models.py:153
+#: django_q/models.py:192
 msgid "Number of minutes for the Minutes type"
 msgstr "Nombre de minutes pour le type de minutes"

-#: models.py:154
+#: django_q/models.py:195
 msgid "Repeats"
 msgstr "Répéter"

-#: models.py:154
+#: django_q/models.py:195
 msgid "n = n times, -1 = forever"
 msgstr "n = n fois,-1 = Toujours"

-#: models.py:155
+#: django_q/models.py:198
 msgid "Next Run"
 msgstr "Prochaine exécution"

-#: models.py:180
+#: django_q/models.py:205
+msgid "Cron expression"
+msgstr "Expression du Cron"
+
+#: django_q/models.py:235
 msgid "Scheduled task"
 msgstr "Tâche planifiée"

-#: models.py:181
+#: django_q/models.py:236
 msgid "Scheduled tasks"
 msgstr "Tâches planifiées"

-#: models.py:204
+#: django_q/models.py:262
 msgid "Queued task"
 msgstr "Tâche en file d'attente"

-#: models.py:205
+#: django_q/models.py:263
 msgid "Queued tasks"
 msgstr "Tâches en file d'attente"

-#: monitor.py:33
+#: django_q/monitor.py:62 django_q/monitor.py:339
 msgid "Host"
 msgstr "Hôte"

-#: monitor.py:34
+#: django_q/monitor.py:66 django_q/monitor.py:343 django_q/monitor.py:450
 msgid "Id"
 msgstr "Id"

-#: monitor.py:35
+#: django_q/monitor.py:70
 msgid "State"
 msgstr "Statut"

-#: monitor.py:36
+#: django_q/monitor.py:74
 msgid "Pool"
 msgstr "Piscine"

-#: monitor.py:37
+#: django_q/monitor.py:78
 msgid "TQ"
 msgstr "TQ"

-#: monitor.py:38
+#: django_q/monitor.py:82
 msgid "RQ"
 msgstr "RQ"

-#: monitor.py:39
+#: django_q/monitor.py:86
 msgid "RC"
 msgstr "RC"

-#: monitor.py:40
+#: django_q/monitor.py:90
 msgid "Up"
 msgstr "Haut"

-#: monitor.py:90 monitor.py:165
+#: django_q/monitor.py:170 django_q/monitor.py:279
 msgid "Queued"
 msgstr "En file d'attente"

-#: monitor.py:92
+#: django_q/monitor.py:178
 msgid "Success"
 msgstr "Succès"

-#: monitor.py:95 monitor.py:173
+#: django_q/monitor.py:188 django_q/monitor.py:287
 msgid "Failures"
 msgstr "Défaillances"

-#: monitor.py:101
+#: django_q/monitor.py:199 django_q/monitor.py:485
 msgid "[Press q to quit]"
 msgstr "[appuyez sur q pour quitter]"

-#: monitor.py:120
+#: django_q/monitor.py:223
 msgid "day"
 msgstr "jour"

-#: monitor.py:137
+#: django_q/monitor.py:244
 msgid "second"
 msgstr "seconde"

-#: monitor.py:140
+#: django_q/monitor.py:247
 msgid "minute"
 msgstr "minute"

-#: monitor.py:143
+#: django_q/monitor.py:250
 msgid "hour"
 msgstr "heure"

-#: monitor.py:151
-msgid "-- {} {} on {}  --"
-msgstr "--{} {} sur {}--"
+#: django_q/monitor.py:260
+#, python-format
+msgid "-- %(prefix)s %(version)s on %(info)s --"
+msgstr "--%(prefix)s %(version)s sur %(info)s --"

-#: monitor.py:153
+#: django_q/monitor.py:266
 msgid "Clusters"
 msgstr "Grappes"

-#: monitor.py:157
+#: django_q/monitor.py:270
 msgid "Workers"
 msgstr "Processus"

-#: monitor.py:161
+#: django_q/monitor.py:274
 msgid "Restarts"
 msgstr "Redémarrages"

-#: monitor.py:169
+#: django_q/monitor.py:283
 msgid "Successes"
 msgstr "Succès"

-#: monitor.py:177
+#: django_q/monitor.py:292
 msgid "Schedules"
 msgstr "Planifications"

-#: monitor.py:181
-msgid "Tasks/{}"
-msgstr "Tâches/{}"
+#: django_q/monitor.py:296
+#, python-format
+msgid "Tasks/%(per)s"
+msgstr "Tâches/%(per)s"

-#: monitor.py:185
+#: django_q/monitor.py:300
 msgid "Avg time"
 msgstr "Temps Moyen"

-#: signals.py:21
-msgid "malformed return hook '{}' for [{}]"
-msgstr "hook de retour mal formé' {} 'pour [{}]"
+#: django_q/monitor.py:348
+msgid "Available (%)"
+msgstr ""

-#: signals.py:26
-msgid "return hook {} failed on [{}] because {}"
-msgstr "le crochet de retour {} a échoué sur [{}] parce que {}"
+#: django_q/monitor.py:354
+msgid "Available (MB)"
+msgstr "Disponible sur (MB)"
+
+#: django_q/monitor.py:359
+msgid "Total (MB)"
+msgstr "Total (MB)"
+
+#: django_q/monitor.py:364
+msgid "Sentinel (MB)"
+msgstr "Sentinel (MB)"
+
+#: django_q/monitor.py:370
+msgid "Monitor (MB)"
+msgstr "Monitor (MB)"
+
+#: django_q/monitor.py:376
+#, fuzzy
+#| msgid "Workers"
+msgid "Workers (MB)"
+msgstr "Processus (MB)"
+
+#: django_q/monitor.py:478
+#, python-format
+msgid "Available lowest (): %(memory_percent)s ((at)s)"
+msgstr "Disponible le plus bas () : %(memory_percent)s ((at)s)"
+
+#: django_q/monitor.py:496
+msgid "No clusters appear to be running."
+msgstr "Aucun cluster ne semble être en cours d'exécution."
+
+#: django_q/signals.py:22
+#, python-format
+msgid "malformed return hook '%(hook)s' for [%(name)s]"
+msgstr "hook de retour mal formé' %(hook)s 'pour [%(name)s]"
+
+#: django_q/signals.py:30
+#, python-format
+msgid "return hook %(hook)s failed on [%(name)s] because %(error)s"
+msgstr "le crochet de retour %(hook)s a échoué sur [%(name)s] parce que %(error)s"
--- a/django_q/locale/tr/LC_MESSAGES/django.po
+++ b/django_q/locale/tr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-18 23:55+0300\n"
+"POT-Creation-Date: 2022-11-12 01:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ethem Güner <ethemguener@gmail.com>\n"
 "Language-Team: \n"
@@ -17,166 +17,199 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: django_q/admin.py:40
+
+#: django_q/admin.py:43
 msgid "Resubmit selected tasks to queue"
 msgstr "Seçili işleri kuyruğa tekrar gönder"

-#: django_q/brokers/disque.py:60
-msgid "No Disque nodes configured"
-msgstr "Disque nodları konfigüre edilmemiş"
+#: django_q/admin.py:98 django_q/models.py:228
+#, fuzzy
+#| msgid "Success"
+msgid "success"
+msgstr "başarılı olanlar"

-#: django_q/brokers/disque.py:77
-msgid "Could not connect to any Disque nodes"
-msgstr "Herhangi bir Disque noduna bağlanılamadı"
-
-#: django_q/cluster.py:79
-#, python-brace-format
-msgid "Q Cluster {self.name} starting."
-msgstr "Q Cluster {self.name} başlatılıyor."
-
-#: django_q/cluster.py:87
-#, python-brace-format
-msgid "Q Cluster {self.name} stopping."
-msgstr "Q Cluster {self.name} durduruluyor."
-
-#: django_q/cluster.py:90
-#, python-brace-format
-msgid "Q Cluster {self.name} has stopped."
-msgstr "Q Cluster {self.name} durduruldu."
-
-#: django_q/cluster.py:98
-msgid ""
-"{current_process().name} got signal {Conf.SIGNAL_NAMES.get(signum, \"UNKNOWN"
-"\")}"
+#: django_q/admin.py:109 django_q/models.py:230
+msgid "last_run"
 msgstr ""
-"{current_process().name} şu sinyali aldı {Conf.SIGNAL_NAMES.get(signum, \"UNKNOWN"
-"\")}"

-#: django_q/cluster.py:220
-#, python-brace-format
-msgid "reincarnated monitor {process.name} after sudden death"
-msgstr "Monitor {process.name} ani ölüm sonrası tekrar dirildi"
+#: django_q/cluster.py:77
+#, python-format
+msgid "Q Cluster %(name)s starting."
+msgstr "Q Cluster %(name)s başlatılıyor."

-#: django_q/cluster.py:223
-#, python-brace-format
-msgid "reincarnated pusher {process.name} after sudden death"
-msgstr "Pusher {process.name} ani ölüm sonrası tekrar dirildi"
+#: django_q/cluster.py:85
+#, python-format
+msgid "Q Cluster %(name)s stopping."
+msgstr "Q Cluster %(name)s durduruluyor."

-#: django_q/cluster.py:230
-#, python-brace-format
-msgid "reincarnated worker {process.name} after timeout"
-msgstr "Worker {process.name} zaman aşımı sonrası tekrar dirildi"
+#: django_q/cluster.py:88
+#, python-format
+msgid "Q Cluster %(name)s has stopped."
+msgstr "Q Cluster %(name)s durduruldu."

-#: django_q/cluster.py:232
-#, python-brace-format
-msgid "recycled worker {process.name}"
-msgstr "Worker {process.name} geri döndürüldü"
+#: django_q/cluster.py:96
+#, python-format
+msgid "%(name)s got signal %(signal)s"
+msgstr "%(name)s, %(signal)s pid'inde izleniyor/monitoring yapılıyor."

-#: django_q/cluster.py:234
-#, python-brace-format
-msgid "reincarnated worker {process.name} after death"
-msgstr "Worker {process.name} ani ölüm sonrası tekrar dirildi"
+#: django_q/cluster.py:219
+#, python-format
+msgid "reincarnated monitor %(name)s after sudden death"
+msgstr "Monitor %(name)s ani ölüm sonrası tekrar dirildi"
+
+#: django_q/cluster.py:222
+#, python-format
+msgid "reincarnated pusher %(name)s after sudden death"
+msgstr "Pusher %(name)s ani ölüm sonrası tekrar dirildi"
+
+#: django_q/cluster.py:229
+#, python-format
+msgid "reincarnated worker %(name)s after timeout"
+msgstr "Worker %(name)s zaman aşımı sonrası tekrar dirildi"
+
+#: django_q/cluster.py:231
+#, python-format
+msgid "recycled worker %(name)s"
+msgstr "Worker %(name)s geri döndürüldü"
+
+#: django_q/cluster.py:233
+#, python-format
+msgid "reincarnated worker %(name)s after death"
+msgstr "Worker %(name)s ani ölüm sonrası tekrar dirildi"

 #: django_q/cluster.py:256
-msgid ""
-"{current_process().name} guarding cluster {humanize(self.cluster_id.hex)}"
-msgstr "{current_process().name}, {humanize(self.cluster_id.hex)} cluster'ını koruyor"
+#, python-format
+msgid "%(name)s guarding cluster %(cluster_name)s"
+msgstr "%(name)s, %(cluster_name)s cluster'ını koruyor"

 #: django_q/cluster.py:261
-msgid "Q Cluster {humanize(self.cluster_id.hex)} running."
-msgstr "Q Cluster {humanize(self.cluster_id.hex)} çalışıyor."
+#, python-format
+msgid "Q Cluster %(cluster_name)s running."
+msgstr "Q Cluster %(cluster_name)s başlatılıyor."

 #: django_q/cluster.py:295
-#, python-brace-format
-msgid "{name} stopping cluster processes"
-msgstr "Cluster {name} işlemleri durduruluyor."
+#, python-format
+msgid "%(name)s stopping cluster processes"
+msgstr "Cluster %(name)s işlemleri durduruluyor."

 #: django_q/cluster.py:320
-#, python-brace-format
-msgid "{name} waiting for the monitor."
-msgstr "{name} monitor için bekliyor."
+#, python-format
+msgid "%(name)s waiting for the monitor."
+msgstr "%(name)s monitor için bekliyor."

 #: django_q/cluster.py:342
-msgid "{current_process().name} pushing tasks at {current_process().pid}"
-msgstr "{current_process().name, işleri {current_process().pid} pid'ine gönderiyor."
+#, python-format
+msgid "%(process_name)s pushing tasks at %(id)s"
+msgstr "%(process_name)s, işleri %(id)s pid'ine gönderiyor."

 #: django_q/cluster.py:363
-#, python-brace-format
-msgid "queueing from {broker.list_key}"
+#, python-format
+msgid "queueing from %(list_key)s"
 msgstr ""

 #: django_q/cluster.py:366
-msgid "{current_process().name} stopped pushing tasks"
-msgstr "{current_process().name} işleri göndermeyi durdurdu"
+#, python-format
+msgid "%(name)s stopped pushing tasks"
+msgstr "%(name)s işleri göndermeyi durdurdu"

 #: django_q/cluster.py:378
-msgid "{name} monitoring at {current_process().pid}"
-msgstr "{name}, {current_process().pid} pid'inde izleniyor/monitoring yapılıyor."
+#, python-format
+msgid "%(name)s monitoring at %(id)s"
+msgstr "%(name)s, %(id)s pid'inde izleniyor/monitoring yapılıyor."

-#: django_q/cluster.py:394
-msgid "Processed [{task['name']}]"
-msgstr "[{task['name']}] işlendi."
-
-#: django_q/cluster.py:397
-msgid "Failed [{task['name']}] - {task['result']}"
-msgstr "[{task['name']}] - {task['result']} başarısız oldu"
+#: django_q/cluster.py:395
+#, python-format
+msgid "Processed '%(info_name)s' (%(task_name)s)"
+msgstr "[%(task_name)s] - '%(info_name)s işlendi."

 #: django_q/cluster.py:398
-#, python-brace-format
-msgid "{name} stopped monitoring results"
-msgstr "{name} sonuçları göstermeyi bıraktı"
+#, python-format
+msgid "Failed '%(info_name)s' (%(task_name)s) - %(task_result)s"
+msgstr "[%(task_name)s] - '%(info_name)s' - %(task_result)s başarısız oldu"

-#: django_q/cluster.py:412
-msgid "{name} ready for work at {current_process().pid}"
-msgstr "{name}, {current_process().pid} pid'inde çalışmaya hazır"
+#: django_q/cluster.py:399
+#, python-format
+msgid "%(name)s stopped monitoring results"
+msgstr "%(name)s sonuçları göstermeyi bıraktı"

-#: django_q/cluster.py:422
-msgid "{name} processing [{task[\"name\"]}]"
-msgstr "{name}, [{task[\"name\"]}] işlerini işiyor"
+#: django_q/cluster.py:413
+#, python-format
+msgid "%(proc_name)s ready for work at %(id)s"
+msgstr "%(proc_name)s, %(id)s pid'inde çalışmaya hazır"

-#: django_q/cluster.py:453
-#, python-brace-format
-msgid "{name} stopped doing work"
-msgstr "{name} çalışmayı bıraktı"
+#: django_q/cluster.py:425
+#, python-format
+msgid "%(proc_name)s processing '%(func_name)s' (%(task_name)s)"
+msgstr "%(proc_name)s, '%(func_name)s' [%(task_name)s] işlerini işiyor"

-#: django_q/cluster.py:635 django_q/models.py:143
+#: django_q/cluster.py:440
+#, python-format
+msgid ""
+"Could not process '%(func_name)s'. Check the location of the function and "
+"the args/kwargs."
+msgstr ""
+"%(func_name)s' işlenemedi. İşlevin konumunu ve args/kwargs öğelerini kontrol "
+"edin."
+
+#: django_q/cluster.py:456
+#, python-format
+msgid "%(proc_name)s stopped doing work"
+msgstr "%(proc_name)s çalışmayı bıraktı"
+
+#: django_q/cluster.py:649 django_q/models.py:144
 msgid "Please install croniter to enable cron expressions"
 msgstr "Cron expressions'ları açmak için croniter yükleyin"

-#: django_q/cluster.py:665
-msgid ""
-"{current_process().name} failed to create a task from schedule [{s.name or s."
-"id}]"
-msgstr ""
+#: django_q/cluster.py:672
+#, python-format
+msgid "%(process_name)s failed to create a task from schedule [%(schedule)s]"
+msgstr "%(process_name)s programdan bir görev oluşturamadı [%(schedule)s]"

-#: django_q/cluster.py:671
-msgid ""
-"{current_process().name} created a task from schedule [{s.name or s.id}]"
-msgstr ""
+#: django_q/cluster.py:678
+#, python-format
+msgid "%(process_name)s created a task from schedule [%(schedule)s]"
+msgstr "%(process_name)s programdan bir görev oluşturamadı [%(schedule)s]"

-#: django_q/cluster.py:737
-#, python-brace-format
-msgid "{pid} will use cpu {affinity}"
+#: django_q/cluster.py:718
+msgid "Skipping cpu affinity because psutil was not found."
+msgstr "Psutil bulunamadığı için cpu benzeşimi atlanıyor."
+
+#: django_q/cluster.py:723
+msgid "Faking cpu affinity because it is not supported on this platform"
+msgstr "Bu platformda desteklenmediği için sahte cpu benzeşimi"
+
+#: django_q/cluster.py:744
+#, python-format
+msgid "%(pid)s will use cpu %(affinity)s"
+msgstr "%(pid)s cpu %(affinity)s kullanacaktır"
+
+#: django_q/conf.py:85
+#, python-format
+msgid ""
+"SAVE_LIMIT_PER (%(option)s) is not a valid option. Options are: 'group', "
+"'name', 'func' and None. Default is None."
 msgstr ""
+"SAVE_LIMIT_PER (%(option)s) geçerli bir seçenek değil. Seçenekler şunlardır: "
+"'group', 'name', 'func' ve None. Varsayılan değer None'dır."

 #. Translators: Cluster status descriptions
-#: django_q/conf.py:196
+#: django_q/conf.py:194
 msgid "Starting"
 msgstr "Başlıyor"

-#: django_q/conf.py:197
+#: django_q/conf.py:195
 msgid "Working"
 msgstr "Çalışıyor"

-#: django_q/conf.py:198
+#: django_q/conf.py:196
 msgid "Idle"
 msgstr "Boşta"

-#: django_q/conf.py:199
+#: django_q/conf.py:197
 msgid "Stopped"
 msgstr "Durdu"

-#: django_q/conf.py:200
+#: django_q/conf.py:198
 msgid "Stopping"
 msgstr "Durduruluyor"

@@ -200,239 +233,255 @@ msgstr "Q Cluster'ın bellek kullanımını izler"
 msgid "Monitors Q Cluster activity"
 msgstr "Q Cluster'ın aktivitelerini izler"

-#: django_q/models.py:118
+#: django_q/models.py:119
 msgid "Successful task"
 msgstr "Başarılı iş"

-#: django_q/models.py:119
+#: django_q/models.py:120
 msgid "Successful tasks"
 msgstr "Başarılı işler"

-#: django_q/models.py:134
+#: django_q/models.py:135
 msgid "Failed task"
 msgstr "Başarısız iş"

-#: django_q/models.py:135
+#: django_q/models.py:136
 msgid "Failed tasks"
 msgstr "Başarısız işler"

-#: django_q/models.py:159
+#: django_q/models.py:160
 msgid "e.g. 1, 2, 'John'"
 msgstr "Örneğin: 1, 2, 'Melih'"

-#: django_q/models.py:161
+#: django_q/models.py:162
 msgid "e.g. x=1, y=2, name='John'"
 msgstr "Örneğin: x=1, y=2, name='Melih'"

-#: django_q/models.py:173
+#: django_q/models.py:176
 msgid "Once"
 msgstr "Bir kere"

-#: django_q/models.py:174
+#: django_q/models.py:177
 msgid "Minutes"
 msgstr "Dakika"

-#: django_q/models.py:175
+#: django_q/models.py:178
 msgid "Hourly"
 msgstr "Saatlik"

-#: django_q/models.py:176
+#: django_q/models.py:179
 msgid "Daily"
 msgstr "Günlük"

-#: django_q/models.py:177
+#: django_q/models.py:180
 msgid "Weekly"
 msgstr "Haftalık"

-#: django_q/models.py:178
+#: django_q/models.py:181
+#, fuzzy
+#| msgid "Weekly"
+msgid "Biweekly"
+msgstr "İki haftada bir"
+
+#: django_q/models.py:182
 msgid "Monthly"
 msgstr "Aylık"

-#: django_q/models.py:179
+#: django_q/models.py:183
+#, fuzzy
+#| msgid "Monthly"
+msgid "Bimonthly"
+msgstr "İki ayda bir"
+
+#: django_q/models.py:184
 msgid "Quarterly"
 msgstr "Bir Çeyrek (3 Ay)"

-#: django_q/models.py:180
+#: django_q/models.py:185
 msgid "Yearly"
 msgstr "Yıllık"

-#: django_q/models.py:181
+#: django_q/models.py:186
 msgid "Cron"
 msgstr ""

-#: django_q/models.py:184
+#: django_q/models.py:189
 msgid "Schedule Type"
 msgstr "Zamanlama Tipi"

-#: django_q/models.py:187
+#: django_q/models.py:192
 msgid "Number of minutes for the Minutes type"
 msgstr "Dakika tipine göre dakika sayısı"

-#: django_q/models.py:190
+#: django_q/models.py:195
 msgid "Repeats"
 msgstr "Tekrar eder"

-#: django_q/models.py:190
+#: django_q/models.py:195
 msgid "n = n times, -1 = forever"
 msgstr "n = n kere, -1 = sonsuza kadar"

-#: django_q/models.py:193
+#: django_q/models.py:198
 msgid "Next Run"
 msgstr "Bir dahaki çalışma tarihi"

-#: django_q/models.py:200
+#: django_q/models.py:205
 msgid "Cron expression"
 msgstr ""

-#: django_q/models.py:227
+#: django_q/models.py:235
 msgid "Scheduled task"
 msgstr "Zamanlanmış iş"

-#: django_q/models.py:228
+#: django_q/models.py:236
 msgid "Scheduled tasks"
 msgstr "Zamanlanmış işler"

-#: django_q/models.py:251
+#: django_q/models.py:262
 msgid "Queued task"
 msgstr "Sıraya alınmış iş"

-#: django_q/models.py:252
+#: django_q/models.py:263
 msgid "Queued tasks"
 msgstr "Sıraya alınmış işler"

-#: django_q/monitor.py:54 django_q/monitor.py:322
+#: django_q/monitor.py:62 django_q/monitor.py:339
 msgid "Host"
 msgstr ""

-#: django_q/monitor.py:58 django_q/monitor.py:326 django_q/monitor.py:433
+#: django_q/monitor.py:66 django_q/monitor.py:343 django_q/monitor.py:450
 msgid "Id"
 msgstr ""

-#: django_q/monitor.py:62
+#: django_q/monitor.py:70
 msgid "State"
 msgstr "Durum"

-#: django_q/monitor.py:66
+#: django_q/monitor.py:74
 msgid "Pool"
 msgstr "Havuz"

-#: django_q/monitor.py:70
+#: django_q/monitor.py:78
 msgid "TQ"
 msgstr ""

-#: django_q/monitor.py:74
+#: django_q/monitor.py:82
 msgid "RQ"
 msgstr ""

-#: django_q/monitor.py:78
+#: django_q/monitor.py:86
 msgid "RC"
 msgstr ""

-#: django_q/monitor.py:82
+#: django_q/monitor.py:90
 msgid "Up"
 msgstr ""

-#: django_q/monitor.py:162 django_q/monitor.py:266
+#: django_q/monitor.py:170 django_q/monitor.py:279
 msgid "Queued"
 msgstr "Sıraya alınmış"

-#: django_q/monitor.py:170
+#: django_q/monitor.py:178
 msgid "Success"
 msgstr "Başarılı olanlar"

-#: django_q/monitor.py:180 django_q/monitor.py:274
+#: django_q/monitor.py:188 django_q/monitor.py:287
 msgid "Failures"
 msgstr "Başarısız olanlar"

-#: django_q/monitor.py:191
+#: django_q/monitor.py:199 django_q/monitor.py:485
 msgid "[Press q to quit]"
 msgstr "[Çıkmak için q'ya basın]"

-#: django_q/monitor.py:210
+#: django_q/monitor.py:223
 msgid "day"
 msgstr "gün"

-#: django_q/monitor.py:231
+#: django_q/monitor.py:244
 msgid "second"
 msgstr "saniye"

-#: django_q/monitor.py:234
+#: django_q/monitor.py:247
 msgid "minute"
 msgstr "dakika"

-#: django_q/monitor.py:237
+#: django_q/monitor.py:250
 msgid "hour"
 msgstr "saat"

-#: django_q/monitor.py:247
-msgid ""
-"-- {Conf.PREFIX.capitalize()} { \".\".join(str(v) for v in VERSION)} on "
-"{broker.info()}  --"
-msgstr ""
+#: django_q/monitor.py:260
+#, python-format
+msgid "-- %(prefix)s %(version)s on %(info)s --"
+msgstr "-- %(prefix)s %(version)s üzerinde %(info)s --"

-#: django_q/monitor.py:253
+#: django_q/monitor.py:266
 msgid "Clusters"
 msgstr ""

-#: django_q/monitor.py:257
+#: django_q/monitor.py:270
 msgid "Workers"
 msgstr ""

-#: django_q/monitor.py:261
+#: django_q/monitor.py:274
 msgid "Restarts"
 msgstr "Yeniden çalıştırmalar"

-#: django_q/monitor.py:270
+#: django_q/monitor.py:283
 msgid "Successes"
 msgstr "Başarılı olanlar"

-#: django_q/monitor.py:279
+#: django_q/monitor.py:292
 msgid "Schedules"
 msgstr "Zamanlanmışlar"

-#: django_q/monitor.py:283
-#, python-brace-format
-msgid "Tasks/{per}"
-msgstr "İş/{per}"
+#: django_q/monitor.py:296
+#, python-format
+msgid "Tasks/%(per)s"
+msgstr "İş/%(per)s"

-#: django_q/monitor.py:287
+#: django_q/monitor.py:300
 msgid "Avg time"
 msgstr "Ortalama süre"

-#: django_q/monitor.py:331
+#: django_q/monitor.py:348
 msgid "Available (%)"
 msgstr "Müsait (%) "

-#: django_q/monitor.py:337
+#: django_q/monitor.py:354
 msgid "Available (MB)"
 msgstr "Müsait (MB)"

-#: django_q/monitor.py:342
+#: django_q/monitor.py:359
 msgid "Total (MB)"
 msgstr "Toplam (MB)"

-#: django_q/monitor.py:347
+#: django_q/monitor.py:364
 msgid "Sentinel (MB)"
 msgstr ""

-#: django_q/monitor.py:353
+#: django_q/monitor.py:370
 msgid "Monitor (MB)"
 msgstr "İzleme (MB)"

-#: django_q/monitor.py:359
+#: django_q/monitor.py:376
 msgid "Workers (MB)"
 msgstr ""

-#: django_q/monitor.py:461
-msgid "Available lowest (%): {} ({})"
-msgstr "Mevcut en düşük (%): {} ({})"
+#: django_q/monitor.py:478
+#, python-format
+msgid "Available lowest (): %(memory_percent)s ((at)s)"
+msgstr "Mevcut en düşük (): %(memory_percent)s ((at)s)"
+
+#: django_q/monitor.py:496
+msgid "No clusters appear to be running."
+msgstr "Hiçbir küme çalışıyor görünmüyor."

 #: django_q/signals.py:22
-#, python-brace-format
-msgid "malformed return hook '{instance.hook}' for [{instance.name}]"
+#, python-format
+msgid "malformed return hook '%(hook)s' for [%(name)s]"
 msgstr ""

 #: django_q/signals.py:30
-msgid ""
-"return hook {instance.hook} failed on [{instance.name}] because {str(e)}"
+#, python-format
+msgid "return hook %(hook)s failed on [%(name)s] because %(error)s"
 msgstr ""
--- a/django_q/migrations/0015_alter_schedule_schedule_type.py
+++ b/django_q/migrations/0015_alter_schedule_schedule_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.2 on 2022-11-10 01:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_q', '0014_schedule_cluster'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='schedule',
+            name='schedule_type',
+            field=models.CharField(choices=[('O', 'Once'), ('I', 'Minutes'), ('H', 'Hourly'), ('D', 'Daily'), ('W', 'Weekly'), ('BW', 'Biweekly'), ('M', 'Monthly'), ('BM', 'Bimonthly'), ('Q', 'Quarterly'), ('Y', 'Yearly'), ('C', 'Cron')], default='O', max_length=2, verbose_name='Schedule Type'),
+        ),
+    ]
--- a/django_q/models.py
+++ b/django_q/models.py
@@ -15,6 +15,7 @@ from picklefield.fields import dbsafe_decode
 # Local
 from django_q.conf import croniter
 from django_q.signing import SignedPackage
+from .utils import get_func_repr


 class Task(models.Model):
@@ -165,7 +166,9 @@ class Schedule(models.Model):
    HOURLY = "H"
    DAILY = "D"
    WEEKLY = "W"
+    BIWEEKLY = "BW"
    MONTHLY = "M"
+    BIMONTHLY = "BM"
    QUARTERLY = "Q"
    YEARLY = "Y"
    CRON = "C"
@@ -175,13 +178,15 @@ class Schedule(models.Model):
        (HOURLY, _("Hourly")),
        (DAILY, _("Daily")),
        (WEEKLY, _("Weekly")),
+        (BIWEEKLY, _("Biweekly")),
        (MONTHLY, _("Monthly")),
+        (BIMONTHLY, _("Bimonthly")),
        (QUARTERLY, _("Quarterly")),
        (YEARLY, _("Yearly")),
        (CRON, _("Cron")),
    )
    schedule_type = models.CharField(
-        max_length=1, choices=TYPE, default=TYPE[0][0], verbose_name=_("Schedule Type")
+        max_length=2, choices=TYPE, default=TYPE[0][0], verbose_name=_("Schedule Type")
    )
    minutes = models.PositiveSmallIntegerField(
        null=True, blank=True, help_text=_("Number of minutes for the Minutes type")
@@ -241,7 +246,7 @@ class OrmQ(models.Model):
        return SignedPackage.loads(self.payload)

    def func(self):
-        return self.task()["func"]
+        return get_func_repr(self.task()["func"])

    def task_id(self):
        return self.task()["id"]
--- a/django_q/monitor.py
+++ b/django_q/monitor.py
@@ -257,8 +257,8 @@ def info(broker=None):
        term.black_on_green(
            term.center(
                _(
-                    f'-- {Conf.PREFIX.capitalize()} { ".".join(str(v) for v in VERSION)} on {broker.info()}  --'
-                )
+                    '-- %(prefix)s %(version)s on %(info)s --'
+                    ) % {'prefix': Conf.PREFIX.capitalize(), 'version':  ".".join(str(v) for v in VERSION), 'info': broker.info()}
            )
        )
    )
@@ -293,7 +293,7 @@ def info(broker=None):
        + term.move_x(1 * col_width)
        + term.white(str(models.Schedule.objects.count()))
        + term.move_x(2 * col_width)
-        + term.cyan(_(f"Tasks/{per}"))
+        + term.cyan(_("Tasks/%(per)s") % {'per': per})
        + term.move_x(3 * col_width)
        + term.white(f"{tasks_per:.2f}")
        + term.move_x(4 * col_width)
@@ -475,17 +475,14 @@ def memory(run_once=False, workers=False, broker=None):
            row += 1
            print(
                term.move(row, 0)
-                + _("Available lowest (%): {} ({})").format(
-                    str(MEMORY_AVAILABLE_LOWEST_PERCENTAGE),
-                    MEMORY_AVAILABLE_LOWEST_PERCENTAGE_AT.strftime(
-                        "%Y-%m-%d %H:%M:%S+00:00"
-                    ),
-                )
+                + _("Available lowest (): %(memory_percent)s ((at)s)") % { 'memory_percent': str(MEMORY_AVAILABLE_LOWEST_PERCENTAGE), 'at': MEMORY_AVAILABLE_LOWEST_PERCENTAGE_AT.strftime(
+                    "%Y-%m-%d %H:%M:%S+00:00"
+                )}
            )
            # for testing
            if run_once:
                return Stat.get_all(broker=broker)
-            print(term.move(row + 2, 0) + term.center("[Press q to quit]"))
+            print(term.move(row + 2, 0) + term.center(_("[Press q to quit]")))
            val = term.inkey(timeout=1)


@@ -496,5 +493,5 @@ def get_ids():
        for s in stat:
            print(s.cluster_id)
    else:
-        print("No clusters appear to be running.")
+        print(_("No clusters appear to be running."))
    return True
--- a/django_q/signals.py
+++ b/django_q/signals.py
@@ -19,7 +19,7 @@ def call_hook(sender, instance, **kwargs):
                f = getattr(m, func)
            except (ValueError, ImportError, AttributeError):
                logger.error(
-                    _(f"malformed return hook '{instance.hook}' for [{instance.name}]")
+                        _("malformed return hook '%(hook)s' for [%(name)s]") % {'hook': instance.hook, 'name': instance.name}
                )
                return
        try:
@@ -27,8 +27,8 @@ def call_hook(sender, instance, **kwargs):
        except Exception as e:
            logger.error(
                _(
-                    f"return hook {instance.hook} failed on [{instance.name}] because {str(e)}"
-                )
+                    "return hook %(hook)s failed on [%(name)s] because %(error)s"
+                ) % {'hook': instance.hook, 'name': instance.name, 'error': str(e)}
            )


--- a/django_q/tests/test_scheduler.py
+++ b/django_q/tests/test_scheduler.py
@@ -21,6 +21,7 @@ from django_q.tests.testing_utilities.multiple_database_routers import (
    TestingMultipleAppsDatabaseRouter,
    TestingReplicaDatabaseRouter,
 )
+from django_q.utils import add_months, add_years


@pytest.fixture
@@ -228,6 +229,29 @@ def test_scheduler(broker, monkeypatch):
    # Done
    broker.delete_queue()

+    # test bimonthly
+    schedule = create_schedule(
+        "django_q.tests.tasks.word_multiply",
+        2,
+        word="catch_up",
+        schedule_type=Schedule.BIMONTHLY
+    )
+    scheduler(broker=broker)
+    schedule = Schedule.objects.get(pk=schedule.pk)
+    assert schedule.next_run.date() == add_months(timezone.now(), 2).date()
+
+    # test biweekly
+    schedule = create_schedule(
+        "django_q.tests.tasks.word_multiply",
+        2,
+        word="catch_up",
+        schedule_type=Schedule.BIWEEKLY
+    )
+    scheduler(broker=broker)
+    schedule = Schedule.objects.get(pk=schedule.pk)
+    assert schedule.next_run.date() == (timezone.now() + timedelta(weeks=2)).date()
+    broker.delete_queue()
+
    monkeypatch.setattr(Conf, "PREFIX", "some_cluster_name")
    # create a schedule on another cluster
    schedule = create_schedule(
--- a/django_q/utils.py
+++ b/django_q/utils.py
@@ -1,6 +1,5 @@
-import datetime
+import inspect
 from datetime import date
-from django.utils.timezone import make_aware
 import calendar

 # credits: https://stackoverflow.com/a/4131114
@@ -28,3 +27,16 @@ def add_years(d, years):
        new_date = d + (date(d.year + years, 3, 1) - date(d.year, 3, 1))
        return d.replace(year=new_date.year, month=new_date.month, day=new_date.day)

+
+def get_func_repr(func):
+    # convert func to string
+    if inspect.isfunction(func):
+        return f"{func.__module__}.{func.__name__}"
+    elif inspect.ismethod(func) and hasattr(func.__self__, '__name__'):
+        return (
+            f"{func.__self__.__module__}."
+            f"{func.__self__.__name__}.{func.__name__}"
+        )
+    else:
+        return str(func)
+
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,7 +73,7 @@ author = 'Ilan Steemers, Stan Triepels'
 # The short X.Y version.
 version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.1'
+release = '1.4.4'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -27,7 +27,7 @@ Features
 -  Rollbar and Sentry support


-Django Q2 is tested with: Python 3.7, 3.8, 3.9 and 3.10, Django 2.2.x and 3.2.x
+Django Q2 is tested with: Python 3.8, 3.9 and 3.10, 3.11, Django 3.2.x and 4.1.x

 Currently available in English, German and French.

--- a/docs/install.rst
+++ b/docs/install.rst
@@ -4,7 +4,7 @@ Installation

 -  Install the latest version with pip::

-    $ pip install django-q
+    $ pip install django-q2


 -  Add :mod:`django_q` to ``INSTALLED_APPS`` in your projects :file:`settings.py`::
@@ -27,7 +27,7 @@ Installation
 Requirements
 ------------

-Django Q2 is tested for Python 3.7, 3.8, 3.9 and 3.10
+Django Q2 is tested for Python 3.8, 3.9, 3.10 and 3.11

 -  `Django <https://www.djangoproject.com>`__

@@ -125,7 +125,7 @@ Other known issues are:

 Python
 ~~~~~~
-Current tests are performed with 3.7, 3.8, 3.9 and 3.10
+Current tests are performed with 3.8, 3.9, 3.10 and 3.11
 If you do encounter any regressions with earlier versions, please submit an issue on `github <https://github.com/GDay/django-q2>`__

 Open-source packages
--- a/docs/schedules.rst
+++ b/docs/schedules.rst
@@ -165,7 +165,7 @@ Reference

    .. py:attribute:: TYPE

-    :attr:`ONCE`, :attr:`MINUTES`, :attr:`HOURLY`, :attr:`DAILY`, :attr:`WEEKLY`, :attr:`MONTHLY`, :attr:`QUARTERLY`, :attr:`YEARLY`, :attr:`CRON`
+    :attr:`ONCE`, :attr:`MINUTES`, :attr:`HOURLY`, :attr:`DAILY`, :attr:`WEEKLY`, :attr:`BIWEEKLY`, :attr:`MONTHLY`, :attr:`BIMONTHLY`, :attr:`QUARTERLY`, :attr:`YEARLY`, :attr:`CRON`


    .. py:attribute:: minutes
@@ -224,10 +224,23 @@ Reference

    `'W'` the task will run every week on they day and time of the first run.

+    .. py:attribute:: BIWEEKLY
+
+    `'BW'` the task will run once every two weeks on they day and time of the first run.
+
    .. py:attribute:: MONTHLY

    `'M'` the tasks runs every month on they day and time of the last run.

+    .. note::
+
+        Months are tricky. If you schedule something on the 31st of the month and the next month has only 30 days or less, the task will run on the last day of the next month.
+        It will however continue to run on that day, e.g. the 28th, in subsequent months.
+
+    .. py:attribute:: BIMONTHLY
+
+    `'BM'` the tasks runs once every two months on they day and time of the last run.
+
    .. note::

        Months are tricky. If you schedule something on the 31st of the month and the next month has only 30 days or less, the task will run on the last day of the next month.
--- a/poetry.lock
+++ b/poetry.lock
@@ -106,14 +106,14 @@ wcwidth = ">=0.1.4"

 [[package]]
 name = "boto3"
-version = "1.24.94"
+version = "1.24.95"
 description = "The AWS SDK for Python"
 category = "main"
 optional = true
 python-versions = ">= 3.7"

 [package.dependencies]
-botocore = ">=1.27.94,<1.28.0"
+botocore = ">=1.27.95,<1.28.0"
 jmespath = ">=0.7.1,<2.0.0"
 s3transfer = ">=0.6.0,<0.7.0"

@@ -122,7 +122,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]

 [[package]]
 name = "botocore"
-version = "1.27.94"
+version = "1.27.95"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = true
@@ -956,12 +956,12 @@ build-backend = []
 requires = []
 rollbar = ["django-q-rollbar"]
 sentry = ["django-q-sentry"]
-testing = ["django-redis", "croniter", "hiredis", "psutil", "iron-mq", "boto3", "pymongo", "blessed"]
+testing = ["django-redis", "croniter", "hiredis", "psutil", "iron-mq", "boto3", "pymongo", "blessed", "redis"]

 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.8.14, <4"
-content-hash = "ac947d27d316a58fe8f86837360e1328a6771fa740f93841d610e26b85ce859a"
+content-hash = "a5007f22e20151981df5e8e478ceea4b7c3d1932b0c1cef14b9cec39f04bcc84"

 [metadata.files]
 alabaster = [
@@ -1034,12 +1034,12 @@ blessed = [
    {file = "blessed-1.19.1.tar.gz", hash = "sha256:9a0d099695bf621d4680dd6c73f6ad547f6a3442fbdbe80c4b1daa1edbc492fc"},
 ]
 boto3 = [
-    {file = "boto3-1.24.94-py3-none-any.whl", hash = "sha256:f13db0beb3c9fe2cc1ed0f031189f144610d2909b5874a616e77b0bd1ae3b686"},
-    {file = "boto3-1.24.94.tar.gz", hash = "sha256:f4842b395d1580454756622069f4ca0408993885ecede967001d2c101201cdfa"},
+    {file = "boto3-1.24.95-py3-none-any.whl", hash = "sha256:05818ed61af104f28f039592c5c54d802a0398b1f158c2d485ec86352b48033f"},
+    {file = "boto3-1.24.95.tar.gz", hash = "sha256:285d29042c1684f8fc68492ddf20180d28b94aac1f19dd7161bcad3067c01314"},
 ]
 botocore = [
-    {file = "botocore-1.27.94-py3-none-any.whl", hash = "sha256:8237c070d2ab29fac4fbcfe9dd2e84e0ee147402e0fed3ac1629f92459c7f1d2"},
-    {file = "botocore-1.27.94.tar.gz", hash = "sha256:572224608a0b7662966fc303b768e2eba61bf53bdbf314481cd9e63a0d8e1a66"},
+    {file = "botocore-1.27.95-py3-none-any.whl", hash = "sha256:04ff12a8d1d0687a1f1c2dfad5b6fc9f5a81de4b639cf9c9e41fee9449680fd4"},
+    {file = "botocore-1.27.95.tar.gz", hash = "sha256:0b90945aa7080179a0c4941a3809ce4df30792931e16b9b6ef3c739c4f2b7a59"},
 ]
 certifi = [
    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-q2"
-version = "1.4.1"
+version = "1.4.4"
 packages = [
    { include = "django_q" },
 ]
@@ -26,10 +26,10 @@ classifiers = [
    'Operating System :: MacOS',
    'Programming Language :: Python',
    'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.7',
    'Programming Language :: Python :: 3.8',
    'Programming Language :: Python :: 3.9',
    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
    'Topic :: Internet :: WWW/HTTP',
    'Topic :: System :: Distributed Computing',
    'Topic :: Software Development :: Libraries :: Python Modules',
@@ -50,7 +50,6 @@ django-picklefield = "^3.1"

 blessed = { version = "^1.19.1", optional = true }
 hiredis = { version = "^2.0.0", optional = true }
-redis = { version = "^4.3.4", optional = true }
 psutil = { version = "^5.9.2", optional = true }
 django-redis = { version = "^5.2.0", optional = true }
 iron-mq = { version = "^0.9", optional = true }
@@ -59,6 +58,7 @@ pymongo = { version = "^4.2.0", optional = true }
 croniter = { version = "^1.3.7", optional = true }
 django-q-rollbar = {version = ">=0.1", optional = true}
 django-q-sentry = {version = ">=0.1", optional = true}
+redis = {version = "^4.3.4", optional = true}


 [tool.poetry.dev-dependencies]
@@ -72,7 +72,7 @@ isort = {extras = ["requirements_deprecated_finder"], version = "^5.10.1"}
 [tool.poetry.extras]
 requires = ["poetry_core>=1.0.0"]
 build-backend = ["poetry.core.masonry.api"]
-testing = ["django-redis", "croniter", "hiredis", "psutil", "iron-mq", "boto3", "pymongo", "blessed"]
+testing = ["django-redis", "croniter", "hiredis", "psutil", "iron-mq", "boto3", "pymongo", "blessed", "redis"]
 rollbar = ["django-q-rollbar"]
 sentry = ["django-q-sentry"]
Author	SHA1	Message	Date
Stan Triepels	06ad6154e3	Release 1.4.4 (#37 )	2022-11-13 01:06:19 +01:00
Stan Triepels	542e04db54	Feat: Add biweekly and bimonthly and fix translations (#36 )	2022-11-13 01:00:11 +01:00
Stan Triepels	17205549eb	Fix baseconv/base62 deprecation warning for Django 5.x (#34 )	2022-11-09 00:41:12 +01:00
Stan Triepels	1764c5c8ae	Release 1.4.3 (#32 ) Update changelog and bump version number	2022-11-07 17:47:05 +01:00
Mikhail Krassavin	f0cb10bc37	Add Python 3.11 support and tests, remove Python 3.7 (#31 )	2022-11-07 17:29:29 +01:00
Stan Triepels	167c348509	Update changelog and readme (#29 ) Added changes from the previous versions and diff between Q and Q2	2022-11-05 23:06:34 +01:00
Stan Triepels	6f19b3d270	Fix: func reference in admin (#28 )	2022-11-05 02:45:44 +01:00
Stan Triepels	f62bd7b6b4	Fix install docs: update q to q2 (#25 )	2022-10-27 02:08:08 +02:00
Stan Triepels	19d434ed4f	Make redis dependency optional and update boto3 (#22 )	2022-10-21 01:29:21 +02:00