From 9c16a7cbc55afbfdbfe99df21e0c6e6670d5926d Mon Sep 17 00:00:00 2001
From: "N. Geisler" <ngeisler@fachschaft.informatik.tu-darmstadt.de>
Date: Fri, 25 Oct 2019 14:40:00 +0200
Subject: [PATCH] remove email field due to privacy concerns
---
AKModel/locale/de_DE/LC_MESSAGES/django.po | 164 +++++++++---------
.../migrations/0022_remove_akowner_email.py | 16 ++
AKModel/models.py | 1 -
AKSubmission/forms.py | 2 +-
4 files changed, 98 insertions(+), 85 deletions(-)
create mode 100644 AKModel/migrations/0022_remove_akowner_email.py
diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po
index a4ccc84d..762458ee 100644
--- a/AKModel/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-24 22:48+0000\n"
+"POT-Creation-Date: 2019-10-25 12:36+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"
@@ -11,13 +11,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: availability.py:38 models.py:25 models.py:47 models.py:141 models.py:190
-#: models.py:222 models.py:248
+#: availability.py:38 models.py:25 models.py:46 models.py:140 models.py:189
+#: models.py:221 models.py:247
msgid "Event"
msgstr "Event"
-#: availability.py:39 models.py:48 models.py:142 models.py:191 models.py:223
-#: models.py:249
+#: availability.py:39 models.py:47 models.py:141 models.py:190 models.py:222
+#: models.py:248
msgid "Associated event"
msgstr "Zugehöriges Event"
@@ -29,7 +29,7 @@ msgstr "Person"
msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird"
-#: availability.py:56 models.py:226 models.py:241
+#: availability.py:56 models.py:225 models.py:240
msgid "Room"
msgstr "Raum"
@@ -37,7 +37,7 @@ msgstr "Raum"
msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
-#: availability.py:65 models.py:194 models.py:240
+#: availability.py:65 models.py:193 models.py:239
msgid "AK"
msgstr "AK"
@@ -47,7 +47,7 @@ msgstr "AK"
msgid "AK whose availability this is"
msgstr "Verfügbarkeiten"
-#: availability.py:74 models.py:99
+#: availability.py:74 models.py:98
msgid "AK Category"
msgstr "AK Kategorie"
@@ -63,8 +63,8 @@ msgstr "Verfügbarkeit"
msgid "Availabilities"
msgstr "Verfügbarkeiten"
-#: models.py:12 models.py:94 models.py:110 models.py:125 models.py:139
-#: models.py:156 models.py:215
+#: models.py:12 models.py:93 models.py:109 models.py:124 models.py:138
+#: models.py:155 models.py:214
msgid "Name"
msgstr "Name"
@@ -143,274 +143,272 @@ msgid "Slug for URL generation"
msgstr "Slug für URL-Generierung"
#: models.py:43
-msgid "E-Mail Address"
-msgstr "E-Mail Adresse"
-
-#: models.py:43
-msgid "Contact mail"
-msgstr "Kontakt E-Mail"
-
-#: models.py:44
msgid "Institution"
msgstr "Instutution"
-#: models.py:44
+#: models.py:43
msgid "Uni etc."
msgstr "Universität o.ä."
-#: models.py:45 models.py:165
+#: models.py:44 models.py:164
msgid "Web Link"
msgstr "Internet Link"
-#: models.py:45
+#: models.py:44
msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite"
-#: models.py:51
+#: models.py:50
msgid "AK Owner"
msgstr "AK Leitung"
-#: models.py:52
+#: models.py:51
msgid "AK Owners"
msgstr "AK Leitungen"
-#: models.py:94
+#: models.py:93
msgid "Name of the AK Category"
msgstr "Name des AK Kategorie"
-#: models.py:95 models.py:111
+#: models.py:94 models.py:110
msgid "Color"
msgstr "Farbe"
-#: models.py:95 models.py:111
+#: models.py:94 models.py:110
msgid "Color for displaying"
msgstr "Farbe für die Anzeige"
-#: models.py:96 models.py:159
+#: models.py:95 models.py:158
msgid "Description"
msgstr "Beschreibung"
-#: models.py:96
+#: models.py:95
msgid "Short description of this AK Category"
msgstr "Beschreibung der AK-Kategorie"
-#: models.py:100
+#: models.py:99
msgid "AK Categories"
msgstr "AK Kategorien"
-#: models.py:110
+#: models.py:109
msgid "Name of the AK Track"
msgstr "Name des AK Tracks"
-#: models.py:114
+#: models.py:113
msgid "AK Track"
msgstr "AK Track"
-#: models.py:115
+#: models.py:114
msgid "AK Tracks"
msgstr "AK Tracks"
-#: models.py:125
+#: models.py:124
msgid "Name of the AK Tag"
msgstr "Name das AK Tags"
-#: models.py:128
+#: models.py:127
msgid "AK Tag"
msgstr "AK Tag"
-#: models.py:129
+#: models.py:128
msgid "AK Tags"
msgstr "AK Tags"
-#: models.py:139
+#: models.py:138
msgid "Name of the Requirement"
msgstr "Name der Anforderung"
-#: models.py:145
+#: models.py:144
msgid "AK Requirement"
msgstr "AK Anforderung"
-#: models.py:146
+#: models.py:145
msgid "AK Requirements"
msgstr "AK Anforderungen"
-#: models.py:156
+#: models.py:155
msgid "Name of the AK"
msgstr "Name des AKs"
-#: models.py:157
+#: models.py:156
msgid "Short Name"
msgstr "Kurzer Name"
-#: models.py:158
+#: models.py:157
msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK Plan"
-#: models.py:159
+#: models.py:158
msgid "Description of the AK"
msgstr "Beschreibung des AKs"
-#: models.py:161
+#: models.py:160
msgid "Owners"
msgstr "Leitungen"
-#: models.py:162
+#: models.py:161
msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten"
-#: models.py:165
+#: models.py:164
msgid "Link to wiki page"
msgstr "Link zur Wiki Seite"
-#: models.py:167
+#: models.py:166
msgid "Category"
msgstr "Kategorie"
-#: models.py:168
+#: models.py:167
msgid "Category of the AK"
msgstr "Kategorie des AKs"
-#: models.py:169
+#: models.py:168
msgid "Tags"
msgstr "Tags"
-#: models.py:169
+#: models.py:168
msgid "Tags provided by owners"
msgstr "Tags, die durch die AK Leitung vergeben wurden"
-#: models.py:170
+#: models.py:169
msgid "Track"
msgstr "Track"
-#: models.py:171
+#: models.py:170
msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört"
-#: models.py:173
+#: models.py:172
msgid "Resolution Intention"
msgstr "Resolutionsabsicht"
-#: models.py:174
+#: models.py:173
msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen"
-#: models.py:175
+#: models.py:174
msgid "Present this AK"
msgstr "AK Präsentieren"
-#: models.py:176
+#: models.py:175
msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen"
-#: models.py:178
+#: models.py:177
msgid "Requirements"
msgstr "Anforderungen"
-#: models.py:179
+#: models.py:178
msgid "AK's Requirements"
msgstr "Anforderungen des AKs"
-#: models.py:181
+#: models.py:180
msgid "Conflicting AKs"
msgstr "AK Konflikte"
-#: models.py:182
+#: models.py:181
msgid "AKs that conflict and thus must not take place at the same time"
msgstr ""
"AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
-#: models.py:183
+#: models.py:182
msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs"
-#: models.py:184
+#: models.py:183
msgid "AKs that should precede this AK in the schedule"
msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen"
-#: models.py:186
+#: models.py:185
msgid "Internal Notes"
msgstr "Interne Notizen"
-#: models.py:186
+#: models.py:185
msgid "Notes to organizers"
msgstr "Notizen an die Organisator*innen"
-#: models.py:188
+#: models.py:187
msgid "Interest"
msgstr "Interesse"
-#: models.py:188
+#: models.py:187
msgid "Expected number of people"
msgstr "Erwartete Personenzahl"
-#: models.py:195
+#: models.py:194
msgid "AKs"
msgstr "AKs"
-#: models.py:215
+#: models.py:214
msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums"
-#: models.py:216
+#: models.py:215
msgid "Building"
msgstr "Gebäude"
-#: models.py:217
+#: models.py:216
msgid "Name or number of the building"
msgstr "Name oder Nummer des Gebäudes"
-#: models.py:218
+#: models.py:217
msgid "Capacity"
msgstr "Kapazität"
-#: models.py:218
+#: models.py:217
msgid "Maximum number of people"
msgstr "Maximale Personenzahl"
-#: models.py:219
+#: models.py:218
msgid "Properties"
msgstr "Eigenschaften"
-#: models.py:220
+#: models.py:219
msgid "AK requirements fulfilled by the room"
msgstr "AK Anforderungen, die dieser Raum erfüllt"
-#: models.py:227
+#: models.py:226
msgid "Rooms"
msgstr "Räume"
-#: models.py:240
+#: models.py:239
msgid "AK being mapped"
msgstr "AK, der zugeordnet wird"
-#: models.py:242
+#: models.py:241
msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet"
-#: models.py:243
+#: models.py:242
msgid "Slot Begin"
msgstr "Beginn des Slots"
-#: models.py:243
+#: models.py:242
msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt"
-#: models.py:245
+#: models.py:244
msgid "Duration"
msgstr "Dauer"
-#: models.py:246
+#: models.py:245
msgid "Length in hours"
msgstr "Länge in Stunden"
-#: models.py:252
+#: models.py:251
msgid "AK Slot"
msgstr "AK Slot"
-#: models.py:253
+#: models.py:252
msgid "AK Slots"
msgstr "AK Slot"
-#: models.py:267
+#: models.py:266
msgid "Not scheduled yet"
msgstr "Noch nicht geplant"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "E-Mail Adresse"
+
+#~ msgid "Contact mail"
+#~ msgstr "Kontakt E-Mail"
diff --git a/AKModel/migrations/0022_remove_akowner_email.py b/AKModel/migrations/0022_remove_akowner_email.py
new file mode 100644
index 00000000..5a5705b4
--- /dev/null
+++ b/AKModel/migrations/0022_remove_akowner_email.py
@@ -0,0 +1,16 @@
+# Generated by Django 2.2.6 on 2019-10-25 12:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('AKModel', '0021_base_url'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='akowner',
+ name='email',
+ ),
+ ]
diff --git a/AKModel/models.py b/AKModel/models.py
index 90b02197..cc7d36b0 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -40,7 +40,6 @@ class AKOwner(models.Model):
name = models.CharField(max_length=64, verbose_name=_('Nickname'), help_text=_('Name to identify an AK owner by'))
slug = models.SlugField(max_length=64, blank=True, unique=True, verbose_name=_('Slug'),
help_text=_('Slug for URL generation'))
- email = models.EmailField(max_length=128, blank=True, verbose_name=_('E-Mail Address'), help_text=_('Contact mail'))
institution = models.CharField(max_length=128, blank=True, verbose_name=_('Institution'), help_text=_('Uni etc.'))
link = models.URLField(blank=True, verbose_name=_('Web Link'), help_text=_('Link to Homepage'))
diff --git a/AKSubmission/forms.py b/AKSubmission/forms.py
index 57b94341..3dff6f1b 100644
--- a/AKSubmission/forms.py
+++ b/AKSubmission/forms.py
@@ -121,4 +121,4 @@ class AKOwnerForm(forms.ModelForm):
class Meta:
model = AKOwner
- fields = ['name', 'email', 'institution', 'link']
+ fields = ['name', 'institution', 'link']
--
GitLab