Fix generation of JS translations by dropping old locale folder

evap/development/management/commands/dump_testdata.py

@@ -1,9 +1,10 @@
 import os
 
 from django.conf import settings
-from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
+from evap.evaluation.management.commands.tools import logged_call_command
+
 
 class Command(BaseCommand):
     args = ""
@@ -12,7 +13,8 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         outfile_name = os.path.join(settings.BASE_DIR, "development", "fixtures", "test_data.json")
-        call_command(
+        logged_call_command(
+            self.stdout,
             "dumpdata",
             "auth.group",
             "evaluation",

evap/development/management/commands/reload_testdata.py

@@ -1,7 +1,6 @@
-from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
-from evap.evaluation.management.commands.tools import confirm_harmful_operation
+from evap.evaluation.management.commands.tools import confirm_harmful_operation, logged_call_command
 
 
 class Command(BaseCommand):
@@ -14,24 +13,18 @@ def handle(self, *args, **options):
         if not confirm_harmful_operation(self.stdout):
             return
 
-        self.stdout.write('Executing "python manage.py reset_db"')
-        call_command("reset_db", interactive=False)
+        logged_call_command(self.stdout, "reset_db", interactive=False)
 
-        self.stdout.write('Executing "python manage.py migrate"')
-        call_command("migrate")
+        logged_call_command(self.stdout, "migrate")
 
         # clear any data the migrations created.
         # their pks might differ from the ones in the dump, which results in errors on loaddata
-        self.stdout.write('Executing "python manage.py flush"')
-        call_command("flush", interactive=False)
+        logged_call_command(self.stdout, "flush", interactive=False)
 
-        self.stdout.write('Executing "python manage.py loaddata test_data"')
-        call_command("loaddata", "test_data")
+        logged_call_command(self.stdout, "loaddata", "test_data")
 
-        self.stdout.write('Executing "python manage.py clear_cache --all -v=1"')
-        call_command("clear_cache", "--all", "-v=1")
+        logged_call_command(self.stdout, "clear_cache", "--all", "-v=1")
 
-        self.stdout.write('Executing "python manage.py refresh_results_cache"')
-        call_command("refresh_results_cache")
+        logged_call_command(self.stdout, "refresh_results_cache")
 
         self.stdout.write("Done.")

evap/development/management/commands/translate.py

@@ -1,15 +1,16 @@
-from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
+from evap.evaluation.management.commands.tools import logged_call_command
+
 
 class Command(BaseCommand):
     args = ""
     help = 'Execute "makemessages --locale=de --ignore=node_modules/*"'
 
     def handle(self, *args, **options):
-        self.stdout.write('Executing "manage.py makemessages --locale=de --ignore=node_modules/*"')
-        call_command("makemessages", "--locale=de", "--ignore=node_modules/*")
-        call_command(
+        logged_call_command(self.stdout, "makemessages", "--locale=de", "--ignore=node_modules/*")
+        logged_call_command(
+            self.stdout,
             "makemessages",
             "--domain=djangojs",
             "--extension=js,ts",

evap/development/tests/test_commands.py

@@ -10,7 +10,7 @@
 class TestDumpTestDataCommand(TestCase):
     @staticmethod
     def test_dumpdata_called():
-        with patch("evap.development.management.commands.dump_testdata.call_command") as mock:
+        with patch("evap.evaluation.management.commands.tools.call_command") as mock:
             management.call_command("dump_testdata")
 
         outfile_name = os.path.join(settings.BASE_DIR, "development", "fixtures", "test_data.json")
@@ -31,7 +31,7 @@ def test_dumpdata_called():
 
 class TestReloadTestdataCommand(TestCase):
     @patch("builtins.input")
-    @patch("evap.development.management.commands.reload_testdata.call_command")
+    @patch("evap.evaluation.management.commands.tools.call_command")
     def test_aborts(self, mock_call_command, mock_input):
         mock_input.return_value = "not yes"
 
@@ -40,7 +40,7 @@ def test_aborts(self, mock_call_command, mock_input):
         self.assertEqual(mock_call_command.call_count, 0)
 
     @patch("builtins.input")
-    @patch("evap.development.management.commands.reload_testdata.call_command")
+    @patch("evap.evaluation.management.commands.tools.call_command")
     def test_executes_key_commands(self, mock_call_command, mock_input):
         mock_input.return_value = "yes"
 

evap/evaluation/management/commands/tools.py

@@ -2,6 +2,7 @@
 import sys
 
 from django.conf import settings
+from django.core.management import call_command
 
 logger = logging.getLogger(__name__)
 
@@ -40,3 +41,9 @@ def handle(self, *args, **options):
                 raise
 
     return NewClass
+
+
+def logged_call_command(stdout, *args, **kwargs):
+    """Log execution of management command with all args."""
+    stdout.write("Executing python manage.py " + " ".join(list(args) + [f"{a}={b}" for a, b in kwargs.items()]))
+    call_command(*args, **kwargs)

evap/evaluation/templates/bootstrap_datetimepicker.html

@@ -2,7 +2,7 @@
 {% get_current_language as LANGUAGE_CODE %}
 
 <script type="text/javascript" src="{% static 'js/moment.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'js/locale/moment_de.js' %}"></script>
+<script type="text/javascript" src="{% static 'js/moment_de.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 
 <script type="text/javascript">

evap/locale/de/LC_MESSAGES/djangojs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EvaP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-30 17:26+0100\n"
+"POT-Creation-Date: 2023-11-20 21:26+0100\n"
 "PO-Revision-Date: 2023-10-30 17:26+0100\n"
 "Last-Translator: Johannes Wolf <[email protected]>\n"
 "Language-Team: Johannes Wolf (janno42)\n"

evap/static/js/.gitignore

@@ -1,4 +1,3 @@
 # ignore the typescript output, but still track the libraries
 *.js
 !*.min.js
-!sortable_form.js