Skip to content
Snippets Groups Projects
Commit a90dba04 authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

make merged forks compatible

add requirements for testing
update translations
merge migration
parent 722b6b6c
No related branches found
No related tags found
1 merge request!260[WIP] import/export merge
Pipeline #275628 passed
......@@ -37,7 +37,7 @@ test:
script:
- source venv/bin/activate
- echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql
- pip install pytest-cov unittest-xml-reporting beautifulsoup4
- pip install pytest-cov unittest-xml-reporting
- coverage run --source='.' manage.py test --settings AKPlanning.settings_ci
after_script:
- source venv/bin/activate
......@@ -56,7 +56,6 @@ lint:
stage: test
script:
- source venv/bin/activate
- pip install beautifulsoup4
- pylint --load-plugins pylint_django --django-settings-module=AKPlanning.settings_ci --rcfile pylintrc --exit-zero --output-format=text AK* | tee /tmp/pylint.txt
- sed -n 's/^Your code has been rated at \([-0-9.]*\)\/.*/\1/p' /tmp/pylint.txt > public/badges/$CI_JOB_NAME.score
- pylint --load-plugins pylint_django --django-settings-module=AKPlanning.settings_ci --rcfile pylintrc --exit-zero --output-format=pylint_gitlab.GitlabCodeClimateReporter AK* > codeclimate.json
......
This diff is collapsed.
# Generated by Django 5.1.6 on 2025-03-04 09:24
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0063_field_validators'),
('AKModel', '0063_merge_0061_event_export_slot_0062_interest_no_history'),
]
operations = [
]
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-27 15:13+0000\n"
"POT-Creation-Date: 2025-03-04 10:05+0000\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"
......@@ -107,7 +107,6 @@ msgid "Event Status"
msgstr "Event-Status"
#: AKScheduling/templates/admin/AKScheduling/constraint_violations.html:113
#: AKScheduling/views.py:50
msgid "Scheduling"
msgstr "Scheduling"
......@@ -240,7 +239,6 @@ msgstr[1] ""
" "
#: AKScheduling/templates/admin/AKScheduling/unscheduled.html:7
#: AKScheduling/views.py:25
msgid "Unscheduled AK Slots"
msgstr "Noch nicht geschedulte AK-Slots"
......@@ -248,22 +246,10 @@ msgstr "Noch nicht geschedulte AK-Slots"
msgid "Count"
msgstr "Anzahl"
#: AKScheduling/views.py:91
msgid "Constraint violations for"
msgstr "Constraintverletzungen für"
#: AKScheduling/views.py:106
msgid "AKs requiring special attention for"
msgstr "AKs die besondere Aufmerksamkeit erfordern für"
#: AKScheduling/views.py:152
msgid "Interest updated"
msgstr "Interesse aktualisiert"
#: AKScheduling/views.py:166
msgid "Enter interest"
msgstr "Interesse eingeben"
#: AKScheduling/views.py:210
msgid "Wishes"
msgstr "Wünsche"
......@@ -319,6 +305,15 @@ msgstr "Standardverfügbarkeiten für {count} AKs angelegt"
msgid "Constraint Violations"
msgstr "Constraintverletzungen"
#~ msgid "Constraint violations for"
#~ msgstr "Constraintverletzungen für"
#~ msgid "AKs requiring special attention for"
#~ msgstr "AKs die besondere Aufmerksamkeit erfordern für"
#~ msgid "Enter interest"
#~ msgstr "Interesse eingeben"
#~ msgid "Bitte AK auswählen"
#~ msgstr "Please sel"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-27 15:13+0000\n"
"POT-Creation-Date: 2025-03-04 10:05+0000\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"
......@@ -109,21 +109,25 @@ msgstr "AK-Wunsch"
#: AKSubmission/templates/AKSubmission/ak_detail.html:186
#, python-format
msgid ""
"This AK currently takes place for another <span v-html=\"timeUntilEnd\">"
"%(featured_slot_remaining)s</span> minute(s) in %(room)s.&nbsp;"
"This AK currently takes place for another <span v-"
"html=\"timeUntilEnd\">%(featured_slot_remaining)s</span> minute(s) in "
"%(room)s.&nbsp;"
msgstr ""
"Dieser AK findet noch <span v-html=\"timeUntilEnd\">"
"%(featured_slot_remaining)s</span> Minute(n) in %(room)s statt.&nbsp;\n"
"Dieser AK findet noch <span v-"
"html=\"timeUntilEnd\">%(featured_slot_remaining)s</span> Minute(n) in "
"%(room)s statt.&nbsp;\n"
" "
#: AKSubmission/templates/AKSubmission/ak_detail.html:189
#, python-format
msgid ""
"This AK starts in <span v-html=\"timeUntilStart\">"
"%(featured_slot_remaining)s</span> minute(s) in %(room)s.&nbsp;"
"This AK starts in <span v-"
"html=\"timeUntilStart\">%(featured_slot_remaining)s</span> minute(s) in "
"%(room)s.&nbsp;"
msgstr ""
"Dieser AK beginnt in <span v-html=\"timeUntilStart\">"
"%(featured_slot_remaining)s</span> Minute(n) in %(room)s.&nbsp;\n"
"Dieser AK beginnt in <span v-"
"html=\"timeUntilStart\">%(featured_slot_remaining)s</span> Minute(n) in "
"%(room)s.&nbsp;\n"
" "
#: AKSubmission/templates/AKSubmission/ak_detail.html:194
......@@ -274,7 +278,7 @@ msgstr "Die Ergebnisse dieses AKs vorstellen"
msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen"
#: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:84
#: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:82
msgid "All AKs"
msgstr "Alle AKs"
......@@ -400,81 +404,80 @@ msgstr ""
msgid "Submit"
msgstr "Eintragen"
#: AKSubmission/views.py:127
#: AKSubmission/views.py:125
msgid "Wishes"
msgstr "Wünsche"
#: AKSubmission/views.py:127
#: AKSubmission/views.py:125
msgid "AKs one would like to have"
msgstr ""
"AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie "
"macht. Falls du dir das vorstellen kannst, trag dich einfach ein"
#: AKSubmission/views.py:169
#: AKSubmission/views.py:167
msgid "Currently planned AKs"
msgstr "Aktuell geplante AKs"
#: AKSubmission/views.py:233
msgid "AKs with Track"
msgstr "AK mit Track"
#: AKSubmission/views.py:302
#: AKSubmission/views.py:305
msgid "Event inactive. Cannot create or update."
msgstr "Event inaktiv. Hinzufügen/Bearbeiten nicht möglich."
#: AKSubmission/views.py:327
#: AKSubmission/views.py:330
msgid "AK successfully created"
msgstr "AK erfolgreich angelegt"
#: AKSubmission/views.py:400
#: AKSubmission/views.py:404
msgid "AK successfully updated"
msgstr "AK erfolgreich aktualisiert"
#: AKSubmission/views.py:451
#: AKSubmission/views.py:455
#, python-brace-format
msgid "Added '{owner}' as new owner of '{ak.name}'"
msgstr "'{owner}' als neue Leitung von '{ak.name}' hinzugefügt"
#: AKSubmission/views.py:555
#: AKSubmission/views.py:558
msgid "No user selected"
msgstr "Keine Person ausgewählt"
#: AKSubmission/views.py:571
#: AKSubmission/views.py:574
msgid "Person Info successfully updated"
msgstr "Personen-Info erfolgreich aktualisiert"
#: AKSubmission/views.py:607
#: AKSubmission/views.py:610
msgid "AK Slot successfully added"
msgstr "AK-Slot erfolgreich angelegt"
#: AKSubmission/views.py:626
#: AKSubmission/views.py:629
msgid "You cannot edit a slot that has already been scheduled"
msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden"
#: AKSubmission/views.py:636
#: AKSubmission/views.py:639
msgid "AK Slot successfully updated"
msgstr "AK-Slot erfolgreich aktualisiert"
#: AKSubmission/views.py:654
#: AKSubmission/views.py:657
msgid "You cannot delete a slot that has already been scheduled"
msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden"
#: AKSubmission/views.py:664
#: AKSubmission/views.py:667
msgid "AK Slot successfully deleted"
msgstr "AK-Slot erfolgreich angelegt"
#: AKSubmission/views.py:676
#: AKSubmission/views.py:679
msgid "Messages"
msgstr "Nachrichten"
#: AKSubmission/views.py:686
#: AKSubmission/views.py:689
msgid "Delete all messages"
msgstr "Alle Nachrichten löschen"
#: AKSubmission/views.py:713
#: AKSubmission/views.py:716
msgid "Message to organizers successfully saved"
msgstr "Nachricht an die Organisator*innen erfolgreich gespeichert"
#~ msgid "AKs with Track"
#~ msgstr "AK mit Track"
#~ msgid ""
#~ "Due to technical reasons, the link you entered was truncated to a length "
#~ "of 200 characters"
......
......@@ -18,6 +18,10 @@ fontawesomefree==6.6.0 # Makes static files (css, fonts) available locally
mysqlclient==2.2.7 # for production deployment
tzdata==2025.1
# Testing
beautifulsoup4==4.13.3
lxml==5.3.1
# Documentation
Sphinx==8.2.3
sphinx-rtd-theme==3.0.2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment