From a9780ae185a5dce07b21b2491a5186d117ae55df Mon Sep 17 00:00:00 2001
From: Julian Dehm <j.dehm@liqd.net>
Date: Wed, 15 Feb 2023 16:59:54 +0100
Subject: [PATCH 1/3] codes: delete in background tasks

---
 meinberlin/apps/votes/admin.py                |  15 +-
 meinberlin/apps/votes/exports.py              |  33 ++--
 .../votes/migrations/0006_token_packages.py   | 145 ++++++++++++++++++
 meinberlin/apps/votes/models.py               |  42 +++--
 meinberlin/apps/votes/tasks.py                |  57 +++----
 .../token_export_dashboard.html               |  30 ++--
 meinberlin/apps/votes/views.py                |  43 ++----
 meinberlin/fixtures/votes.json                |  39 ++++-
 meinberlin/test/factories/votes.py            |  11 +-
 tests/budgeting/conftest.py                   |   1 +
 tests/votes/conftest.py                       |   1 +
 .../dashboard_components/test_token_export.py |  55 ++++---
 .../test_token_generation.py                  | 102 ++++++------
 13 files changed, 398 insertions(+), 176 deletions(-)
 create mode 100644 meinberlin/apps/votes/migrations/0006_token_packages.py

diff --git a/meinberlin/apps/votes/admin.py b/meinberlin/apps/votes/admin.py
index 5eb542e7cf..53d7b394f0 100644
--- a/meinberlin/apps/votes/admin.py
+++ b/meinberlin/apps/votes/admin.py
@@ -1,5 +1,6 @@
 from django.contrib import admin
 
+from .models import TokenPackage
 from .models import TokenVote
 from .models import VotingToken
 
@@ -11,19 +12,25 @@ class VotingTokenAdmin(admin.ModelAdmin):
         "token_hash",
         "module",
         "is_active",
-        "package_number",
+        "package",
         "allowed_votes",
     )
-    readonly_fields = ("token", "token_hash", "package_number")
+    readonly_fields = ("token", "token_hash", "package")
     list_display = ("pk", "__str__", "project", "module", "module_name", "is_active")
     list_filter = ("module__project",)
 
+    def delete_model(self, request, obj):
+        obj.package.size -= 1
+        obj.package.save()
+        super().delete_model(request, obj)
+
     def module_name(self, token):
         return token.module.name
 
     def save_model(self, request, obj, form, change):
-        if obj.package_number is None:
-            obj.package_number = VotingToken.next_package_number(obj.module)
+        if not hasattr(obj, "package"):
+            obj.package = TokenPackage.objects.create(module=obj.module, size=1)
+
         if not obj.token_hash:
             obj.token_hash = VotingToken.hash_token(obj.token, obj.module)
         super().save_model(request, obj, form, change)
diff --git a/meinberlin/apps/votes/exports.py b/meinberlin/apps/votes/exports.py
index 80e5448197..5d7aef6940 100644
--- a/meinberlin/apps/votes/exports.py
+++ b/meinberlin/apps/votes/exports.py
@@ -5,7 +5,9 @@
 
 from adhocracy4.exports.views import AbstractXlsxExportView
 from adhocracy4.projects.mixins import ProjectMixin
+from meinberlin.apps.votes.models import TokenPackage
 from meinberlin.apps.votes.models import VotingToken
+from meinberlin.apps.votes.tasks import delete_plain_codes
 
 
 class TokenExportView(
@@ -20,30 +22,36 @@ class TokenExportView(
     def get_permission_object(self):
         return self.module.project
 
-    def get_package_number(self):
-        package_number = self.request.GET.get("package") or 0
+    def get_package(self):
         try:
-            return int(package_number)
+            pk = int(self.request.GET.get("package"))
+            return TokenPackage.objects.get(pk=pk)
         except ValueError:
             return None
 
     def get_queryset(self):
         """Filter QS to only include active tokens from module."""
-        package_number = self.get_package_number()
-        if package_number is None:
+        package = self.get_package()
+        if package is None:
             return None
         return (
             super()
             .get_queryset()
-            .filter(module=self.module, is_active=True, package_number=package_number)
+            .filter(
+                module=self.module,
+                is_active=True,
+                package=package,
+            )
             .exclude(token="")
             .order_by("pk")
         )
 
     def get_base_filename(self):
-        package_number = self.get_package_number()
-        if not package_number:
-            package_number = 0
+        package = self.get_package()
+        package_number = (
+            TokenPackage.objects.filter(module=self.module, pk__lt=package.pk).count()
+            + 1
+        )
         return "%s_package_%s" % (self.project.slug, package_number)
 
     def get_header(self):
@@ -55,11 +63,14 @@ def export_rows(self):
         queryset = self.get_queryset()
         # raise BadRequest as either package has been downloaded
         # already or wrong package number
-        if queryset is None or queryset.count() == 0:
+        package = self.get_package()
+        if queryset is None or queryset.count() == 0 or not package.is_created:
             raise BadRequest
         for item in queryset:
             yield [self.get_token_data(item)]
-        queryset.update(token="")
+        package.downloaded = True
+        package.save()
+        delete_plain_codes(package.pk)
 
     def get_token_data(self, item):
         """Add dashes like in string method."""
diff --git a/meinberlin/apps/votes/migrations/0006_token_packages.py b/meinberlin/apps/votes/migrations/0006_token_packages.py
new file mode 100644
index 0000000000..f1dbfd22f6
--- /dev/null
+++ b/meinberlin/apps/votes/migrations/0006_token_packages.py
@@ -0,0 +1,145 @@
+# Generated by Django 3.2.17 on 2023-02-17 11:35
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import meinberlin.apps.votes.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("a4modules", "0006_module_blueprint_type"),
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("meinberlin_votes", "0005_alter_votingtoken_token"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="VotingToken",
+        ),
+        migrations.DeleteModel(
+            name="TokenVote",
+        ),
+        migrations.CreateModel(
+            name="TokenPackage",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("size", models.PositiveIntegerField()),
+                ("downloaded", models.BooleanField(default=False)),
+                (
+                    "module",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="a4modules.module",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["pk"],
+            },
+        ),
+        migrations.CreateModel(
+            name="VotingToken",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "token",
+                    models.CharField(
+                        blank=True,
+                        default=meinberlin.apps.votes.models.get_token_16,
+                        editable=False,
+                        max_length=40,
+                    ),
+                ),
+                (
+                    "token_hash",
+                    models.CharField(editable=False, max_length=128, unique=True),
+                ),
+                ("allowed_votes", models.PositiveSmallIntegerField(default=5)),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this token should be treated as active. Unselect this instead of deleting tokens.",
+                    ),
+                ),
+                (
+                    "module",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="a4modules.module",
+                    ),
+                ),
+                (
+                    "package",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="meinberlin_votes.tokenpackage",
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TokenVote",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name="Created",
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        blank=True, editable=False, null=True, verbose_name="Modified"
+                    ),
+                ),
+                ("object_pk", models.PositiveIntegerField()),
+                (
+                    "content_type",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "token",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="meinberlin_votes.votingtoken",
+                    ),
+                ),
+            ],
+            options={
+                "unique_together": {("content_type", "object_pk", "token")},
+                "index_together": {("content_type", "object_pk")},
+            },
+        ),
+    ]
diff --git a/meinberlin/apps/votes/models.py b/meinberlin/apps/votes/models.py
index 03a71f809c..fc0a8edb88 100644
--- a/meinberlin/apps/votes/models.py
+++ b/meinberlin/apps/votes/models.py
@@ -6,6 +6,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.db.models import Sum
 from django.db.utils import IntegrityError
 from django.utils.translation import gettext_lazy as _
 
@@ -56,6 +57,34 @@ def get_or_create_salt_for_module(module):
         return token_salt.salt
 
 
+class TokenPackage(models.Model):
+    module = models.ForeignKey(Module, on_delete=models.CASCADE)
+    size = models.PositiveIntegerField()
+    downloaded = models.BooleanField(default=False)
+
+    class Meta:
+        ordering = ["pk"]
+
+    @property
+    def num_tokens(self):
+        return VotingToken.objects.filter(package=self).count()
+
+    @property
+    def is_created(self):
+        return self.num_tokens == self.size
+
+    @staticmethod
+    def get_sum_token(module):
+        num_tokens = (
+            TokenPackage.objects.filter(module=module)
+            .aggregate(Sum("size"))
+            .get("size__sum")
+        )
+        if num_tokens is None:
+            num_tokens = 0
+        return num_tokens
+
+
 class VotingToken(models.Model):
     token = models.CharField(
         max_length=40, default=get_token_16, blank=True, editable=False
@@ -63,7 +92,7 @@ class VotingToken(models.Model):
     token_hash = models.CharField(max_length=128, editable=False, unique=True)
     module = models.ForeignKey(Module, on_delete=models.CASCADE)
     allowed_votes = models.PositiveSmallIntegerField(default=5)
-    package_number = models.PositiveIntegerField()
+    package = models.ForeignKey(TokenPackage, on_delete=models.CASCADE)
     is_active = models.BooleanField(
         default=True,
         help_text=_(
@@ -108,17 +137,6 @@ def project(self):
     def is_valid_for_item(self, item):
         return item.module == self.module
 
-    @staticmethod
-    def next_package_number(module):
-        token = (
-            VotingToken.objects.filter(module=module)
-            .order_by("-package_number")
-            .first()
-        )
-        if token:
-            return token.package_number + 1
-        return 0
-
     @staticmethod
     def hash_token(token, module):
         salt = TokenSalt.get_or_create_salt_for_module(module)
diff --git a/meinberlin/apps/votes/tasks.py b/meinberlin/apps/votes/tasks.py
index dc1c20304e..034e4a6c20 100644
--- a/meinberlin/apps/votes/tasks.py
+++ b/meinberlin/apps/votes/tasks.py
@@ -1,79 +1,72 @@
 from background_task import background
 
 from adhocracy4.modules.models import Module
+from meinberlin.apps.votes.models import TokenPackage
 from meinberlin.apps.votes.models import VotingToken
 from meinberlin.apps.votes.models import get_token_16
 
 # Number of tokens to insert into database per bulk_create
-BATCH_SIZE = int(1e3)
+BATCH_SIZE = int(1e5)
 # Max number of tokens in one download / package
-PACKAGE_SIZE = int(1e4)
+PACKAGE_SIZE = int(1e6)
 
 
-def generate_voting_tokens(module_id, number_of_tokens, existing_tokens):
+def generate_voting_tokens(module_id, number_of_tokens):
     module = Module.objects.get(pk=module_id)
-    module_name = module.name
-    project_id = module.project.id
-    project_name = module.project.name
 
     number_to_generate = number_of_tokens
-    # for votes.models.VotingToken.package_number, used for download
-    package_number = VotingToken.next_package_number(module)
     # determine when to go to next package_number
     package_number_limit = 0
-
+    package_size = number_of_tokens
     if number_of_tokens > PACKAGE_SIZE:
         package_number_limit = number_of_tokens - PACKAGE_SIZE
+        package_size = PACKAGE_SIZE
+    package = TokenPackage.objects.create(module=module, size=package_size)
+
     while number_to_generate > 0:
         if number_to_generate >= BATCH_SIZE:
             generate_voting_tokens_batch(
                 module_id,
                 BATCH_SIZE,
-                package_number,
-                number_of_tokens,
-                module_name,
-                project_id,
-                project_name,
-                existing_tokens,
+                package.pk,
             )
             number_to_generate = number_to_generate - BATCH_SIZE
         else:
             generate_voting_tokens_batch(
                 module_id,
                 number_to_generate,
-                package_number,
-                number_of_tokens,
-                module_name,
-                project_id,
-                project_name,
-                existing_tokens,
+                package.pk,
             )
             number_to_generate = 0
-        if package_number_limit >= number_to_generate:
-            package_number += 1
+        if package_number_limit > 0 and package_number_limit >= number_to_generate:
             package_number_limit = package_number_limit - PACKAGE_SIZE
+            if package_number_limit < PACKAGE_SIZE:
+                package_size = number_to_generate
+            package = TokenPackage.objects.create(module=module, size=package_size)
 
 
 @background(schedule=1)
 def generate_voting_tokens_batch(
     module_id,
     batch_size,
-    package_number,
-    number_of_tokens,
-    module_name,
-    project_id,
-    project_name,
-    existing_tokens,
+    package_id,
 ):
     module = Module.objects.get(pk=module_id)
+    package = TokenPackage.objects.get(pk=package_id)
     VotingToken.objects.bulk_create(
-        [get_token_and_hash(module, package_number) for i in range(batch_size)]
+        [get_token_and_hash(module, package) for i in range(batch_size)]
     )
 
 
-def get_token_and_hash(module, package_number):
+def get_token_and_hash(module, package):
     token = get_token_16()
     token_hash = VotingToken.hash_token(token, module)
     return VotingToken(
-        token=token, token_hash=token_hash, module=module, package_number=package_number
+        token=token, token_hash=token_hash, module=module, package=package
     )
+
+
+@background(schedule=1)
+def delete_plain_codes(package_pk):
+    queryset = VotingToken.objects.filter(package__pk=package_pk)
+    queryset.update(token="")
diff --git a/meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html b/meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html
index e215bf1c6b..69dfdbf3e2 100644
--- a/meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html
+++ b/meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html
@@ -1,5 +1,5 @@
 {% extends "a4dashboard/base_dashboard_project.html" %}
-{% load i18n static %}
+{% load i18n static humanize %}
 
 {% block dashboard_project_content %}
     <h1 class="u-first-heading">{% translate 'Download voting codes' %}</h1>
@@ -8,26 +8,26 @@ <h1 class="u-first-heading">{% translate 'Download voting codes' %}</h1>
     <p class="u-bottom-divider">{% blocktranslate %}Number of generated codes: {{ number_of_module_tokens }}.{% endblocktranslate %}</p>
     <ul class="u-list-reset">
         {% if token_export_url %}
-            {% for number, downloadable in token_packages %}
+            {% for package, downloaded, size in token_packages %}
             <li class="u-bottom-divider u-space-between">
-              <div class="" id="id-export-tokens-hint-{{ number }}">
-                    {% translate " code package no." %} {{ number|add:1 }}
+              <div class="" id="id-export-tokens-hint-{{ forloop.counter }}">
+                    {% translate " code package no." %}  {{ forloop.counter }} ({% blocktranslate with count_int=size|intcomma count counter=size %}{{ count_int }} Code{% plural %}{{ count_int }} Codes{% endblocktranslate %})
                 </div>
                 <a
-                {% if downloadable %}
-                  class="btn btn--secondary"
+                {% if downloaded %}
+                    class="btn btn--light disabled"
                 {% else %}
-                  class="btn btn--light disabled"
+                    class="btn btn--secondary"
                 {% endif %}
-                  id="download-link-{{ number }}"
-                  aria-labelledby="id-export-tokens-hint-{{ number }} download-link--{{ number }}"
-                  href="{{ token_export_url }}?package={{ number }}"
+                  id="download-link-{{ forloop.counter }}"
+                  aria-labelledby="id-export-tokens-hint-{{ forloop.counter }} download-link--{{ forloop.counter }}"
+                  href="{{ token_export_url }}?package={{ package }}"
                 >
-                    {% if downloadable %}
-                        {% translate "Download" %}
-                    {% else %}
-                        {% translate "Encrypted" %}
-                    {% endif %}
+                {% if downloaded %}
+                    {% translate "Encrypted" %}
+                {% else %}
+                    {% translate "Download" %}
+                {% endif %}
                 </a>
             </li>
             {% endfor %}
diff --git a/meinberlin/apps/votes/views.py b/meinberlin/apps/votes/views.py
index 7e605985cd..09fb8558af 100644
--- a/meinberlin/apps/votes/views.py
+++ b/meinberlin/apps/votes/views.py
@@ -10,11 +10,12 @@
 from adhocracy4.dashboard import mixins as dashboard_mixins
 from adhocracy4.projects.mixins import ProjectMixin
 from meinberlin.apps.votes.forms import TokenBatchCreateForm
+from meinberlin.apps.votes.models import TokenPackage
 from meinberlin.apps.votes.models import VotingToken
 from meinberlin.apps.votes.tasks import PACKAGE_SIZE
 from meinberlin.apps.votes.tasks import generate_voting_tokens
 
-TOKENS_PER_MODULE = int(1e5)
+TOKENS_PER_MODULE = int(5e6)
 
 
 class ExportTokenDashboardView(
@@ -26,26 +27,13 @@ class ExportTokenDashboardView(
     permission_required = "a4projects.change_project"
     template_name = "meinberlin_votes/token_export_dashboard.html"
 
-    def _get_number_of_tokens(self):
-        """Return total and downloadable token count for module."""
-        return VotingToken.objects.filter(module=self.module, is_active=True).count()
-
     def _get_packages(self):
-        downloadable_tokens = (
-            VotingToken.objects.filter(module=self.module, is_active=True)
-            .exclude(token="")
-            .values("package_number")
-            .distinct()
-        )
-        downloaded_tokens = VotingToken.objects.filter(
-            module=self.module, is_active=True, token=""
-        ).values("package_number")
-        tokens = {}
-        for token in downloadable_tokens:
-            tokens[token["package_number"]] = True
-        for token in downloaded_tokens:
-            tokens[token["package_number"]] = False
-        return sorted(tokens.items())
+        packages = TokenPackage.objects.filter(module=self.module)
+        result = []
+        for package in packages:
+            if package.is_created:
+                result.append((package.pk, package.downloaded, package.num_tokens))
+        return result
 
     def get_permission_object(self):
         return self.project
@@ -55,7 +43,9 @@ def get_context_data(self, **kwargs):
         context["token_export_url"] = reverse(
             "a4dashboard:token-export", kwargs={"module_slug": self.module.slug}
         )
-        context["number_of_module_tokens"] = intcomma(self._get_number_of_tokens())
+        context["number_of_module_tokens"] = intcomma(
+            TokenPackage.get_sum_token(self.module)
+        )
         context["token_packages"] = self._get_packages()
         context["export_size"] = intcomma(PACKAGE_SIZE)
         context["contact_email"] = settings.CONTACT_EMAIL
@@ -89,15 +79,14 @@ class TokenGenerationDashboardView(
     permission_required = "is_superuser"
     template_name = "meinberlin_votes/token_generation_dashboard.html"
 
-    def _get_number_of_tokens(self):
-        return VotingToken.objects.filter(module=self.module, is_active=True).count()
-
     def get_permission_object(self):
         return self.project
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["number_of_module_tokens"] = intcomma(self._get_number_of_tokens())
+        context["number_of_module_tokens"] = intcomma(
+            TokenPackage.get_sum_token(self.module)
+        )
         context["tokens_per_module"] = intcomma(TOKENS_PER_MODULE)
         return context
 
@@ -110,7 +99,7 @@ def get_success_url(self):
     def form_valid(self, form):
         number_of_tokens = form.cleaned_data["number_of_tokens"]
         # check that no more than 5 Million codes are added per module
-        existing_tokens = self._get_number_of_tokens()
+        existing_tokens = TokenPackage.get_sum_token(self.module)
         if existing_tokens + number_of_tokens > TOKENS_PER_MODULE:
             messages.error(
                 self.request,
@@ -118,7 +107,7 @@ def form_valid(self, form):
             )
         else:
             # make tasks to generate the tokens
-            generate_voting_tokens(self.module.pk, number_of_tokens, existing_tokens)
+            generate_voting_tokens(self.module.pk, number_of_tokens)
 
             messages.success(
                 self.request,
diff --git a/meinberlin/fixtures/votes.json b/meinberlin/fixtures/votes.json
index 28e185cd77..9b60eddda7 100644
--- a/meinberlin/fixtures/votes.json
+++ b/meinberlin/fixtures/votes.json
@@ -23,15 +23,42 @@
       "module": 11
     }
   },
+  {
+    "model": "meinberlin_votes.tokenpackage",
+    "pk": 1,
+    "fields": {
+      "module": 11,
+      "size": 1,
+      "downloaded": false
+    }
+  },
+  {
+    "model": "meinberlin_votes.tokenpackage",
+    "pk": 2,
+    "fields": {
+      "module": 10,
+      "size": 1,
+      "downloaded": false
+    }
+  },
+  {
+    "model": "meinberlin_votes.tokenpackage",
+    "pk": 3,
+    "fields": {
+      "module": 2,
+      "size": 1,
+      "downloaded": false
+    }
+  },
   {
     "model": "meinberlin_votes.votingtoken",
     "pk": 1,
     "fields": {
       "token": "votingtoken1",
       "token_hash": "09fb33ef7a5a39c6e97e3f3878f052bf824921e6bd6926b5706c0dee65e26c58de28336991138c7094938b9acdb9d5d490cea7690297006b2cf7d28a8514f0f6",
-      "module": 10,
+      "module": 11,
       "allowed_votes": 5,
-      "package_number": 0,
+      "package": 1,
       "is_active": true
     }
   },
@@ -41,9 +68,9 @@
     "fields": {
       "token": "votingtoken1",
       "token_hash": "1e63f9521e1d857640c88c2d060d40d34022d47198a610af86f95b61cb54171d5cd7329fbceebfc7e609d253c500db5ed5f0f512d16fa6210219f3cb5a756f1c",
-      "module": 2,
+      "module": 10,
       "allowed_votes": 5,
-      "package_number": 0,
+      "package": 2,
       "is_active": true
     }
   },
@@ -53,9 +80,9 @@
     "fields": {
       "token": "votingtoken1",
       "token_hash": "31303469863c7231782709b020bb8921c238ea241404517910394a7f377efd8456a916cbfc9aac5df63125971e5b6baf96120b89580ca9e1574815d6616c71c0",
-      "module": 11,
+      "module": 2,
       "allowed_votes": 5,
-      "package_number": 0,
+      "package": 3,
       "is_active": true
     }
   }
diff --git a/meinberlin/test/factories/votes.py b/meinberlin/test/factories/votes.py
index 7f3eae8842..8a827705ae 100644
--- a/meinberlin/test/factories/votes.py
+++ b/meinberlin/test/factories/votes.py
@@ -8,14 +8,23 @@
 from meinberlin.apps.votes import models as voting_models
 
 
+class TokenPackageFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = voting_models.TokenPackage
+
+    module = factory.SubFactory(a4_factories.ModuleFactory)
+    downloaded = False
+    size = 1
+
+
 class VotingTokenFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = voting_models.VotingToken
 
     token = fuzzy.FuzzyText(length=16, chars=string.ascii_letters + string.digits)
     module = factory.SubFactory(a4_factories.ModuleFactory)
+    package = factory.SubFactory(TokenPackageFactory)
     allowed_votes = 5
-    package_number = 0
     is_active = True
 
     @post_generation
diff --git a/tests/budgeting/conftest.py b/tests/budgeting/conftest.py
index 4d49877f93..31d60cc893 100644
--- a/tests/budgeting/conftest.py
+++ b/tests/budgeting/conftest.py
@@ -6,5 +6,6 @@
 
 register(budgeting.ProposalFactory)
 register(ModerationTaskFactory)
+register(votes.TokenPackageFactory)
 register(votes.TokenVoteFactory)
 register(votes.VotingTokenFactory)
diff --git a/tests/votes/conftest.py b/tests/votes/conftest.py
index a2376eba23..25feb66009 100644
--- a/tests/votes/conftest.py
+++ b/tests/votes/conftest.py
@@ -4,5 +4,6 @@
 from meinberlin.test.factories import votes as votes_factories
 
 register(budgeting_factories.ProposalFactory)
+register(votes_factories.TokenPackageFactory)
 register(votes_factories.TokenVoteFactory)
 register(votes_factories.VotingTokenFactory)
diff --git a/tests/votes/dashboard_components/test_token_export.py b/tests/votes/dashboard_components/test_token_export.py
index 7cbbf10040..2b84608327 100644
--- a/tests/votes/dashboard_components/test_token_export.py
+++ b/tests/votes/dashboard_components/test_token_export.py
@@ -1,4 +1,5 @@
 import pytest
+from background_task.models import Task
 from django.urls import reverse
 
 from adhocracy4.dashboard import components
@@ -12,13 +13,19 @@
 
 
 @pytest.mark.django_db
-def test_token_vote_view(client, phase_factory, module_factory, voting_token_factory):
+def test_token_vote_view(
+    client, phase_factory, module_factory, token_package_factory, voting_token_factory
+):
     phase, module, project, item = setup_phase(phase_factory, None, VotingPhase)
     other_module = module_factory()
-    voting_token_factory(module=module)
-    voting_token_factory(module=module, package_number=1)
-    voting_token_factory(module=module, package_number=2)
-    voting_token_factory(module=module, package_number=3, is_active=False)
+    package0 = token_package_factory(module=module)
+    package1 = token_package_factory(module=module)
+    package2 = token_package_factory(module=module)
+    package3 = token_package_factory(module=module)
+    voting_token_factory(module=module, package=package0)
+    voting_token_factory(module=module, package=package1)
+    voting_token_factory(module=module, package=package2)
+    voting_token_factory(module=module, package=package3, is_active=False)
     voting_token_factory(module=other_module)
 
     initiator = module.project.organisation.initiators.first()
@@ -33,31 +40,32 @@ def test_token_vote_view(client, phase_factory, module_factory, voting_token_fac
     token_packages = response.context["token_packages"]
     number_of_module_tokens = response.context["number_of_module_tokens"]
 
-    assert len(token_packages) == 3
-    # assert packages are downloadable and have right package_number
+    assert len(token_packages) == 4
+    # assert packages are downloadable and have right package_number and size
+    packages = [package0, package1, package2, package3]
     for count, package in enumerate(token_packages):
-        assert package[0] == count
-        assert package[1]
+        assert package[0] == packages[count].pk
+        assert package[1] is False
+        assert package[2] == 1
 
-    response = client.get(export_url)
+    print(export_url)
+    response = client.get(export_url + "?package=" + str(package0.pk))
     assert response.status_code == 200
     assert (
         response.get("Content-Type")
         == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     )
-    assert number_of_module_tokens == "3"
+    assert number_of_module_tokens == "4"
 
     response = client.get(url)
     assert response.status_code == 200
     token_packages = response.context["token_packages"]
-    assert len(token_packages) == 3
-    # assert that first package is no longer downloadable
-    for count, package in enumerate(token_packages):
-        assert package[0] == count
-        if count == 0:
-            assert not package[1]
-        else:
-            assert package[1]
+    assert len(token_packages) == 4
+    # assert that a delete task for the first package has been created
+    assert Task.objects.all().count() == 1
+    task_1 = Task.objects.first()
+    assert task_1.task_name == "meinberlin.apps.votes.tasks.delete_plain_codes"
+    assert task_1.task_params == "[[" + str(package0.pk) + "], {}]"
 
 
 @pytest.mark.django_db
@@ -67,12 +75,13 @@ def test_export(voting_token, rf):
     token_export_url = reverse(
         "a4dashboard:token-export", kwargs={"module_slug": module.slug}
     )
-    request = rf.get(token_export_url)
+    request = rf.get(token_export_url + "?package=" + str(voting_token.package.pk))
     request.user = initiator
     response, view = dispatch_view(TokenExportView, request, module=module)
     voting_token = VotingToken.objects.get(id=voting_token.id)
-    # token should no longer be in the queryset
-    assert voting_token not in view.get_queryset()
-    assert not voting_token.token
+    assert Task.objects.all().count() == 1
+    task_1 = Task.objects.first()
+    assert task_1.task_name == "meinberlin.apps.votes.tasks.delete_plain_codes"
+    assert task_1.task_params == ("[[" + str(voting_token.package.pk) + "], {}]")
     assert module.project.slug in view.get_base_filename()
     assert view.get_token_data(voting_token) == str(voting_token)
diff --git a/tests/votes/dashboard_components/test_token_generation.py b/tests/votes/dashboard_components/test_token_generation.py
index 1e683b8dba..870977556c 100644
--- a/tests/votes/dashboard_components/test_token_generation.py
+++ b/tests/votes/dashboard_components/test_token_generation.py
@@ -12,8 +12,10 @@
 from adhocracy4.test.helpers import redirect_target
 from adhocracy4.test.helpers import setup_phase
 from meinberlin.apps.budgeting.phases import VotingPhase
+from meinberlin.apps.votes.models import TokenPackage
 from meinberlin.apps.votes.models import TokenSalt
 from meinberlin.apps.votes.models import VotingToken
+from meinberlin.apps.votes.tasks import generate_voting_tokens
 from meinberlin.apps.votes.tasks import generate_voting_tokens_batch
 
 component = components.modules.get("voting_token_generation")
@@ -23,14 +25,21 @@
 @patch("meinberlin.apps.votes.tasks.PACKAGE_SIZE", 10)
 @pytest.mark.django_db
 def test_token_generate_view(
-    client, phase_factory, module_factory, voting_token_factory, admin
+    client,
+    phase_factory,
+    module_factory,
+    token_package_factory,
+    voting_token_factory,
+    admin,
 ):
     phase, module, project, item = setup_phase(phase_factory, None, VotingPhase)
     other_module = module_factory()
-    voting_token_factory(module=module)
-    voting_token_factory(module=module)
-    voting_token_factory(module=module, is_active=False)
-    voting_token_factory(module=other_module)
+    package = token_package_factory(module=module, size=3)
+    package_other = token_package_factory(module=other_module)
+    voting_token_factory(module=module, package=package)
+    voting_token_factory(module=module, package=package)
+    voting_token_factory(module=module, package=package, is_active=False)
+    voting_token_factory(module=other_module, package=package_other)
 
     # initiator cannot access token generation view
     initiator = module.project.organisation.initiators.first()
@@ -44,7 +53,7 @@ def test_token_generate_view(
     assert response.status_code == 200
     assert "number_of_module_tokens" in response.context
     number_of_module_tokens = response.context["number_of_module_tokens"]
-    assert number_of_module_tokens == "2"
+    assert number_of_module_tokens == "3"
     data = {"number_of_tokens": 12}
     with translation.override("en_GB"):
         response = client.post(url, data)
@@ -55,44 +64,32 @@ def test_token_generate_view(
     assert str(messages[0]) == (
         "12 codes will be generated in the background. This may take a " "few minutes."
     )
+    assert TokenPackage.objects.all().count() == 4
     assert Task.objects.all().count() == 2
+    package1 = TokenPackage.objects.filter(module=module)[1]
+    package2 = TokenPackage.objects.filter(module=module)[2]
     task_1 = Task.objects.first()
     task_2 = Task.objects.last()
     assert (
         task_1.task_name == "meinberlin.apps.votes.tasks.generate_voting_tokens_batch"
     )
     assert task_1.task_params == (
-        "[["
-        + str(module.id)
-        + ', 10, 1, 12, "'
-        + str(module.name)
-        + '", '
-        + str(module.project.id)
-        + ', "'
-        + str(module.project.name)
-        + '", 2], {}]'
+        "[[" + str(module.id) + ", 10, " + str(package1.pk) + "], {}]"
     )
     assert task_2.task_params == (
-        "[["
-        + str(module.id)
-        + ', 2, 2, 12, "'
-        + str(module.name)
-        + '", '
-        + str(module.project.id)
-        + ', "'
-        + str(module.project.name)
-        + '", 2], {}]'
+        "[[" + str(module.id) + ", 2, " + str(package2.pk) + "], {}]"
     )
 
 
 @patch("meinberlin.apps.votes.views.TOKENS_PER_MODULE", 5)
 @pytest.mark.django_db
 def test_token_generate_view_max_validation(
-    client, phase_factory, voting_token_factory, rf, admin
+    client, phase_factory, token_package_factory, voting_token_factory, rf, admin
 ):
     phase, module, project, item = setup_phase(phase_factory, None, VotingPhase)
-    voting_token_factory(module=module)
-    voting_token_factory(module=module)
+    package = token_package_factory(module=module, size=2)
+    voting_token_factory(module=module, package=package)
+    voting_token_factory(module=module, package=package)
 
     url = component.get_base_url(module)
     client.login(username=admin.email, password="password")
@@ -111,40 +108,55 @@ def test_token_generate_view_max_validation(
 
 
 @pytest.mark.django_db
-def test_token_batch_generation_not_unique(phase_factory):
+def test_token_batch_generation_not_unique(phase_factory, token_package_factory):
     phase, module, project, item = setup_phase(phase_factory, None, VotingPhase)
+    package = token_package_factory(module=module, size=2)
     with patch("secrets.choice", return_value="a"):
         with pytest.raises(IntegrityError):
             with transaction.atomic():
-                generate_voting_tokens_batch.now(
-                    module.id,
-                    2,
-                    0,
-                    2,
-                    module.name,
-                    module.project.id,
-                    module.project.name,
-                    0,
-                )
+                generate_voting_tokens_batch.now(module.id, 2, package.pk)
     tokens = VotingToken.objects.all()
     assert tokens.count() == 0
 
-    generate_voting_tokens_batch.now(
-        module.id, 2, 0, 2, module.name, module.project.id, module.project.name, 0
-    )
+    generate_voting_tokens_batch.now(module.id, 2, package.pk)
     tokens = VotingToken.objects.all()
     assert tokens.count() == 2
 
 
 @pytest.mark.django_db
-def test_token_batch_generation_correct_hash(phase_factory):
+def test_token_batch_generation_correct_hash(phase_factory, token_package_factory):
     phase, module, project, item = setup_phase(phase_factory, None, VotingPhase)
-    generate_voting_tokens_batch.now(
-        module.id, 2, 0, 2, module.name, module.project.id, module.project.name, 0
-    )
+    package = token_package_factory(module=module, size=2)
+    generate_voting_tokens_batch.now(module.id, 2, package.pk)
     tokens = VotingToken.objects.all()
     salt = TokenSalt.get_or_create_salt_for_module(module)
     assert tokens.count() == 2
     for t in tokens:
         token_hash = hashlib.sha3_512((salt + t.token).encode()).hexdigest()
         assert token_hash == t.token_hash
+
+
+@patch("meinberlin.apps.votes.tasks.BATCH_SIZE", 10)
+@patch("meinberlin.apps.votes.tasks.PACKAGE_SIZE", 10)
+@pytest.mark.django_db
+def test_token_correct_amount_of_packages(
+    client,
+    phase_factory,
+    module_factory,
+    token_package_factory,
+    voting_token_factory,
+    admin,
+):
+    phase, module, project, item = setup_phase(phase_factory, None, VotingPhase)
+    generate_voting_tokens(module.pk, 10)
+
+    assert TokenPackage.objects.all().count() == 1
+    assert Task.objects.all().count() == 1
+    package = TokenPackage.objects.first()
+    task_1 = Task.objects.first()
+    assert (
+        task_1.task_name == "meinberlin.apps.votes.tasks.generate_voting_tokens_batch"
+    )
+    assert task_1.task_params == (
+        "[[" + str(module.id) + ", 10, " + str(package.pk) + "], {}]"
+    )

From f3f6a69e1cae983a94ab16678990e17a448e119c Mon Sep 17 00:00:00 2001
From: Julian Dehm <j.dehm@liqd.net>
Date: Wed, 15 Feb 2023 17:19:31 +0100
Subject: [PATCH 2/3] tests/budgeting: fix missing translation

---
 tests/budgeting/test_views_integration.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/budgeting/test_views_integration.py b/tests/budgeting/test_views_integration.py
index 8bcb7ced7c..ff032857a9 100644
--- a/tests/budgeting/test_views_integration.py
+++ b/tests/budgeting/test_views_integration.py
@@ -241,30 +241,30 @@ def test_detail_view_back_link(client, phase_factory, proposal_factory):
         assert response.context["back"] == "{}#proposal_{}".format(
             project_referer, item.id
         )
-        assert response.context["back_string"] == "map"
+        assert response.context["back_string"] == _("map")
         response = client.get(url, HTTP_referer=module_referer)
         assert response.context["back"] == "{}#proposal_{}".format(
             module_referer, item.id
         )
-        assert response.context["back_string"] == "map"
+        assert response.context["back_string"] == _("map")
 
         response = client.get(url, HTTP_referer=filtered_project_referer)
         assert response.context["back"] == "{}#proposal_{}".format(
             filtered_project_referer, item.id
         )
-        assert response.context["back_string"] == "list"
+        assert response.context["back_string"] == _("list")
         response = client.get(url, HTTP_referer=filtered_module_referer)
         assert response.context["back"] == "{}#proposal_{}".format(
             filtered_module_referer, item.id
         )
-        assert response.context["back_string"] == "list"
+        assert response.context["back_string"] == _("list")
 
         response = client.get(url, HTTP_referer="/")
         assert response.context["back"] == module.get_detail_url
-        assert response.context["back_string"] == "map"
+        assert response.context["back_string"] == _("map")
         response = client.get(url)
         assert response.context["back"] == module.get_detail_url
-        assert response.context["back_string"] == "map"
+        assert response.context["back_string"] == _("map")
 
 
 @pytest.mark.django_db

From f38128bb5840f97327b97f78deb3e58cdd651fba Mon Sep 17 00:00:00 2001
From: Julian Dehm <j.dehm@liqd.net>
Date: Thu, 23 Feb 2023 11:26:01 +0100
Subject: [PATCH 3/3] make translations

---
 locale/de_DE/LC_MESSAGES/django.po   | 33 +++++++++++--------
 locale/de_DE/LC_MESSAGES/djangojs.po | 48 ++++++++++++++--------------
 locale/en_GB/LC_MESSAGES/django.po   | 33 +++++++++++--------
 locale/en_GB/LC_MESSAGES/djangojs.po | 48 ++++++++++++++--------------
 4 files changed, 88 insertions(+), 74 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index ad119f91c2..68c6cd9675 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: a4-meinberlin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-20 13:22+0100\n"
+"POT-Creation-Date: 2023-02-23 11:25+0100\n"
 "PO-Revision-Date: 2023-02-17 16:43+0000\n"
 "Last-Translator: Jonathan Ostertag <j.ostertag@liqd.net>\n"
 "Language-Team: German <https://trans.liqd.net/projects/meinberlin/main/de/>\n"
@@ -4745,7 +4745,7 @@ msgstr "Codes erstellen"
 msgid "Code download"
 msgstr "Codes herunterladen"
 
-#: meinberlin/apps/votes/exports.py:51
+#: meinberlin/apps/votes/exports.py:59
 msgid "Voting codes"
 msgstr "Abstimmungscodes"
 
@@ -4773,7 +4773,7 @@ msgstr ""
 "Bitte geben Sie an, wie viele Teilnehmer*innen zur Abstimmung eingeladen "
 "werden sollen. Pro Teilnehmer*in wird ein Code erstellt."
 
-#: meinberlin/apps/votes/models.py:70
+#: meinberlin/apps/votes/models.py:99
 msgid ""
 "Designates whether this token should be treated as active. Unselect this "
 "instead of deleting tokens."
@@ -4781,15 +4781,15 @@ msgstr ""
 "Legt fest, ob dieser Schlüssel aktiviert ist. Entfernen Sie die Auswahl, "
 "anstatt den Schlüssel zu löschen."
 
-#: meinberlin/apps/votes/models.py:168
+#: meinberlin/apps/votes/models.py:186
 msgid "This token is not valid for this project."
 msgstr "Der Abstimmungsschlüssel ist nicht gültig für dieses Projekt."
 
-#: meinberlin/apps/votes/models.py:171
+#: meinberlin/apps/votes/models.py:189
 msgid "This token is not active."
 msgstr "Dieser Abstimmungsschlüssel ist nicht aktiviert."
 
-#: meinberlin/apps/votes/models.py:173
+#: meinberlin/apps/votes/models.py:191
 msgid "This token has no votes left."
 msgstr "Dieser Abstimmungsschlüssel hat keine weiteren Stimmen."
 
@@ -4821,14 +4821,21 @@ msgstr "Anzahl der erstellten Codes: %(number_of_module_tokens)s."
 msgid " code package no."
 msgstr " Code-Paket Nr."
 
-#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:27
-msgid "Download"
-msgstr "Herunterladen"
+#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:14
+#, python-format
+msgid "%(count_int)s Code"
+msgid_plural "%(count_int)s Codes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:29
+#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:27
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
+#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:29
+msgid "Download"
+msgstr "Herunterladen"
+
 #: meinberlin/apps/votes/templates/meinberlin_votes/token_generation_dashboard.html:5
 msgid "Generate voting codes"
 msgstr "Abstimmungscodes erstellen"
@@ -4852,19 +4859,19 @@ msgstr "Um die Codes herunterzuladen gehen Sie bitte zum Code-Download."
 msgid "Generate codes"
 msgstr "Codes erstellen"
 
-#: meinberlin/apps/votes/views.py:77
+#: meinberlin/apps/votes/views.py:67
 msgid ""
 "{} code will be generated in the background. This may take a few minutes."
 msgstr ""
 "{} Code wird im Hintergrund erstellt. Dies kann ein paar Minuten dauern."
 
-#: meinberlin/apps/votes/views.py:81
+#: meinberlin/apps/votes/views.py:71
 msgid ""
 "{} codes will be generated in the background. This may take a few minutes."
 msgstr ""
 "{} Codes werden im Hintergrund erstellt. Dies kann ein paar Minuten dauern."
 
-#: meinberlin/apps/votes/views.py:86
+#: meinberlin/apps/votes/views.py:76
 msgid ""
 "Please adjust your number of codes. Per module you can generate up to {} "
 "codes."
diff --git a/locale/de_DE/LC_MESSAGES/djangojs.po b/locale/de_DE/LC_MESSAGES/djangojs.po
index 8cee5c5b97..e7fb893822 100644
--- a/locale/de_DE/LC_MESSAGES/djangojs.po
+++ b/locale/de_DE/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-20 13:22+0100\n"
+"POT-Creation-Date: 2023-02-23 11:25+0100\n"
 "PO-Revision-Date: 2023-02-10 13:43+0000\n"
 "Last-Translator: Jonathan Ostertag <j.ostertag@liqd.net>\n"
 "Language-Team: German <https://trans.liqd.net/projects/meinberlin/js/de/>\n"
@@ -513,7 +513,7 @@ msgstr "Hochladen"
 
 #: adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js:110
 #: adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js:110
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:27
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:11
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -858,28 +858,6 @@ msgstr ""
 msgid "Nothing to show"
 msgstr "Keine Ergebnisse"
 
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:23
-msgid "Are you finished?"
-msgstr "Sind Sie fertig?"
-
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:24
-msgid "End session"
-msgstr "Sitzung beenden"
-
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:25
-msgid ""
-"To save your votes you do not need to do anything else. End the session to "
-"enter a new code. If you want to change the votes you have already cast, you "
-"can re-enter your code as long as the voting phase is running. "
-msgstr ""
-"Um Ihre abgegebene Stimme zu speichern müssen Sie nichts weiter tun. Beenden "
-"Sie die Sitzung, um einen neuen Code einzugeben. Um Ihre Stimme zu ändern, "
-"können Sie Ihren Code erneut eingeben, solange die Abstimmungsphase läuft. "
-
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:26
-msgid "Do you want to end the session?"
-msgstr "Möchten Sie diese Sitzung beenden?"
-
 #: meinberlin/apps/budgeting/assets/BudgetingProposalListItem.jsx:8
 msgid "updated on"
 msgstr "bearbeitet am"
@@ -929,6 +907,28 @@ msgstr "Vorschläge durchsuchen"
 msgid "Remove filters"
 msgstr "Filter entfernen"
 
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:7
+msgid "Are you finished?"
+msgstr "Sind Sie fertig?"
+
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:8
+msgid "End session"
+msgstr "Sitzung beenden"
+
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:9
+msgid ""
+"To save your votes you do not need to do anything else. End the session to "
+"enter a new code. If you want to change the votes you have already cast, you "
+"can re-enter your code as long as the voting phase is running. "
+msgstr ""
+"Um Ihre abgegebene Stimme zu speichern müssen Sie nichts weiter tun. Beenden "
+"Sie die Sitzung, um einen neuen Code einzugeben. Um Ihre Stimme zu ändern, "
+"können Sie Ihren Code erneut eingeben, solange die Abstimmungsphase läuft. "
+
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:10
+msgid "Do you want to end the session?"
+msgstr "Möchten Sie diese Sitzung beenden?"
+
 #: meinberlin/apps/budgeting/assets/ListItemBadges.jsx:5
 msgid "More"
 msgstr "Mehr"
diff --git a/locale/en_GB/LC_MESSAGES/django.po b/locale/en_GB/LC_MESSAGES/django.po
index bfed041aff..3abea42266 100644
--- a/locale/en_GB/LC_MESSAGES/django.po
+++ b/locale/en_GB/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: a4-meinberlin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-20 13:22+0100\n"
+"POT-Creation-Date: 2023-02-23 11:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4574,7 +4574,7 @@ msgstr "Code generation"
 msgid "Code download"
 msgstr "Code download"
 
-#: meinberlin/apps/votes/exports.py:51
+#: meinberlin/apps/votes/exports.py:59
 msgid "Voting codes"
 msgstr "Voting codes"
 
@@ -4602,7 +4602,7 @@ msgstr ""
 "Please indicate how many participants should be invited to vote. One code "
 "will be generated per participant."
 
-#: meinberlin/apps/votes/models.py:70
+#: meinberlin/apps/votes/models.py:99
 msgid ""
 "Designates whether this token should be treated as active. Unselect this "
 "instead of deleting tokens."
@@ -4610,15 +4610,15 @@ msgstr ""
 "Designates whether this token should be treated as active. Unselect this "
 "instead of deleting tokens."
 
-#: meinberlin/apps/votes/models.py:168
+#: meinberlin/apps/votes/models.py:186
 msgid "This token is not valid for this project."
 msgstr "This token is not valid for this project."
 
-#: meinberlin/apps/votes/models.py:171
+#: meinberlin/apps/votes/models.py:189
 msgid "This token is not active."
 msgstr "This token is not active."
 
-#: meinberlin/apps/votes/models.py:173
+#: meinberlin/apps/votes/models.py:191
 msgid "This token has no votes left."
 msgstr "This token has no votes left."
 
@@ -4649,14 +4649,21 @@ msgstr "Number of generated codes: %(number_of_module_tokens)s."
 msgid " code package no."
 msgstr " code package no."
 
-#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:27
-msgid "Download"
-msgstr "Download"
+#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:14
+#, python-format
+msgid "%(count_int)s Code"
+msgid_plural "%(count_int)s Codes"
+msgstr[0] "%(count_int)s Code"
+msgstr[1] "%(count_int)s Codes"
 
-#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:29
+#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:27
 msgid "Encrypted"
 msgstr "Encrypted"
 
+#: meinberlin/apps/votes/templates/meinberlin_votes/token_export_dashboard.html:29
+msgid "Download"
+msgstr "Download"
+
 #: meinberlin/apps/votes/templates/meinberlin_votes/token_generation_dashboard.html:5
 msgid "Generate voting codes"
 msgstr "Generate voting codes"
@@ -4680,19 +4687,19 @@ msgstr "To download them please go to code download."
 msgid "Generate codes"
 msgstr "Generate codes"
 
-#: meinberlin/apps/votes/views.py:77
+#: meinberlin/apps/votes/views.py:67
 msgid ""
 "{} code will be generated in the background. This may take a few minutes."
 msgstr ""
 "{} code will be generated in the background. This may take a few minutes."
 
-#: meinberlin/apps/votes/views.py:81
+#: meinberlin/apps/votes/views.py:71
 msgid ""
 "{} codes will be generated in the background. This may take a few minutes."
 msgstr ""
 "{} codes will be generated in the background. This may take a few minutes."
 
-#: meinberlin/apps/votes/views.py:86
+#: meinberlin/apps/votes/views.py:76
 msgid ""
 "Please adjust your number of codes. Per module you can generate up to {} "
 "codes."
diff --git a/locale/en_GB/LC_MESSAGES/djangojs.po b/locale/en_GB/LC_MESSAGES/djangojs.po
index 7862c61b41..b69af78197 100644
--- a/locale/en_GB/LC_MESSAGES/djangojs.po
+++ b/locale/en_GB/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-20 13:22+0100\n"
+"POT-Creation-Date: 2023-02-23 11:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -397,7 +397,7 @@ msgid "Upload"
 msgstr "Upload"
 
 #: adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js:110
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:27
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:11
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -673,28 +673,6 @@ msgstr "Proposals list"
 msgid "Nothing to show"
 msgstr "Nothing to show"
 
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:23
-msgid "Are you finished?"
-msgstr "Are you finished?"
-
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:24
-msgid "End session"
-msgstr "End session"
-
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:25
-msgid ""
-"To save your votes you do not need to do anything else. End the session to "
-"enter a new code. If you want to change the votes you have already cast, you "
-"can re-enter your code as long as the voting phase is running. "
-msgstr ""
-"To save your votes you do not need to do anything else. End the session to "
-"enter a new code. If you want to change the votes you have already cast, you "
-"can re-enter your code as long as the voting phase is running. "
-
-#: meinberlin/apps/budgeting/assets/BudgetingProposalList.jsx:26
-msgid "Do you want to end the session?"
-msgstr "Do you want to end the session?"
-
 #: meinberlin/apps/budgeting/assets/BudgetingProposalListItem.jsx:8
 msgid "updated on"
 msgstr "updated on"
@@ -744,6 +722,28 @@ msgstr "Search for Proposals"
 msgid "Remove filters"
 msgstr "Remove filters"
 
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:7
+msgid "Are you finished?"
+msgstr "Are you finished?"
+
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:8
+msgid "End session"
+msgstr "End session"
+
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:9
+msgid ""
+"To save your votes you do not need to do anything else. End the session to "
+"enter a new code. If you want to change the votes you have already cast, you "
+"can re-enter your code as long as the voting phase is running. "
+msgstr ""
+"To save your votes you do not need to do anything else. End the session to "
+"enter a new code. If you want to change the votes you have already cast, you "
+"can re-enter your code as long as the voting phase is running. "
+
+#: meinberlin/apps/budgeting/assets/EndSessionLink.jsx:10
+msgid "Do you want to end the session?"
+msgstr "Do you want to end the session?"
+
 #: meinberlin/apps/budgeting/assets/ListItemBadges.jsx:5
 msgid "More"
 msgstr "More"