From f905658fcfd311c6fe77ba3310e34fcee53e2902 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 20 Nov 2023 21:44:39 +0100
Subject: [PATCH] Fix generation of JS translations by dropping old locale
 folder

---
 evap/development/management/commands/translate.py       | 4 ++++
 evap/evaluation/templates/bootstrap_datetimepicker.html | 2 +-
 evap/locale/de/LC_MESSAGES/djangojs.po                  | 2 +-
 evap/static/js/.gitignore                               | 1 +
 evap/static/js/locale/select2_de.js                     | 3 ---
 evap/static/js/locale/select2_en.js                     | 3 ---
 evap/static/js/{locale => }/moment_de.js                | 0
 7 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 evap/static/js/locale/select2_de.js
 delete mode 100644 evap/static/js/locale/select2_en.js
 rename evap/static/js/{locale => }/moment_de.js (100%)

diff --git a/evap/development/management/commands/translate.py b/evap/development/management/commands/translate.py
index 929fdfdeeb..0a62db71a2 100644
--- a/evap/development/management/commands/translate.py
+++ b/evap/development/management/commands/translate.py
@@ -9,6 +9,10 @@ class Command(BaseCommand):
     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/*")
+        self.stdout.write(
+            'Executing ""makemessages --domain=djangojs --extension=js,ts "'
+            '"--locale=de --ignore=node_modules/* --ignore=evap/static/js/*.min.js",'
+        )
         call_command(
             "makemessages",
             "--domain=djangojs",
diff --git a/evap/evaluation/templates/bootstrap_datetimepicker.html b/evap/evaluation/templates/bootstrap_datetimepicker.html
index 406b3a4e2b..f72177f2a9 100644
--- a/evap/evaluation/templates/bootstrap_datetimepicker.html
+++ b/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">
diff --git a/evap/locale/de/LC_MESSAGES/djangojs.po b/evap/locale/de/LC_MESSAGES/djangojs.po
index 120570d0e0..f4bb89da06 100644
--- a/evap/locale/de/LC_MESSAGES/djangojs.po
+++ b/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 <janno42@posteo.de>\n"
 "Language-Team: Johannes Wolf (janno42)\n"
diff --git a/evap/static/js/.gitignore b/evap/static/js/.gitignore
index 71ed8340ba..a614b17fb8 100644
--- a/evap/static/js/.gitignore
+++ b/evap/static/js/.gitignore
@@ -2,3 +2,4 @@
 *.js
 !*.min.js
 !sortable_form.js
+!moment_de.js
\ No newline at end of file
diff --git a/evap/static/js/locale/select2_de.js b/evap/static/js/locale/select2_de.js
deleted file mode 100644
index 2224138e3b..0000000000
--- a/evap/static/js/locale/select2_de.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.0 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-(function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;return e.define("select2/i18n/de",[],function(){return{inputTooLong:function(e){var t=e.input.length-e.maximum;return"Bitte "+t+" Zeichen weniger eingeben"},inputTooShort:function(e){var t=e.minimum-e.input.length;return"Bitte "+t+" Zeichen mehr eingeben"},loadingMore:function(){return"Lade mehr Ergebnisse…"},maximumSelected:function(e){var t="Sie können nur "+e.maximum+" Eintr";return e.maximum===1?t+="ag":t+="äge",t+=" auswählen",t},noResults:function(){return"Keine Übereinstimmungen gefunden"},searching:function(){return"Suche…"}}}),{define:e.define,require:e.require}})();
\ No newline at end of file
diff --git a/evap/static/js/locale/select2_en.js b/evap/static/js/locale/select2_en.js
deleted file mode 100644
index 869dfd7b21..0000000000
--- a/evap/static/js/locale/select2_en.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.0 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-(function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;return e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return t!=1&&(n+="s"),n},inputTooShort:function(e){var t=e.minimum-e.input.length,n="Please enter "+t+" or more characters";return n},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return e.maximum!=1&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),{define:e.define,require:e.require}})();
\ No newline at end of file
diff --git a/evap/static/js/locale/moment_de.js b/evap/static/js/moment_de.js
similarity index 100%
rename from evap/static/js/locale/moment_de.js
rename to evap/static/js/moment_de.js