New questions - by Eya & Julian

Das sollte https://otrs.wikimedia.de/otrs/index.pl?Action=AgentTicketZoom;TicketID=1314485 lösen. Angaben von Jens Behrend.

README.md

@@ -7,6 +7,8 @@ meaning "Onboarding, Change, Offboarding"
 
 # development
 
+- install gettext for instance via "apt install gettext" for translations
+
 - set up a virtual environment with virtualenvwrapper or some other
 environment managing tool
 
@@ -52,6 +54,7 @@ run the following commands:
 
   python3 manage.py migrate
   python3 manage.py collectstatic
+  django-admin compilemessages
 
 server starts with
 

TODO

@@ -1,3 +1,8 @@
+* switch to django 4
+
+
+minor stuff:
+
 * remove dot before "Nextcloud" at login page.
 
 * add Testmode warning at login screen

eva/settings_development.py

@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 
 from pathlib import Path
+import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -58,12 +59,14 @@ MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
+    'allauth.account.middleware.AccountMiddleware'
+    ]
 
 ROOT_URLCONF = 'eva.urls'
 
@@ -119,7 +122,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/3.1/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'de'
 
 TIME_ZONE = 'UTC'
 
@@ -129,6 +132,7 @@ USE_L10N = True
 
 USE_TZ = True
 
+LOCALE_PATHS = ( os.path.join(BASE_DIR, 'locale'), )
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.1/howto/static-files/

eva/settings_production.py

@@ -81,6 +81,7 @@ MIDDLEWARE = [
     'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -141,7 +142,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/3.1/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'de'
 
 TIME_ZONE = 'UTC'
 
@@ -151,6 +152,7 @@ USE_L10N = True
 
 USE_TZ = True
 
+LOCALE_PATHS = ( os.path.join(BASE_DIR, 'locale'), )
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.1/howto/static-files/

evapp/forms.py

@@ -29,7 +29,7 @@ class PersonalForm(EvaForm):
 
     class Meta:
         model = Employee
-        fields = ['firstname', 'lastname', 'department', 'team', ]
+        fields = ['firstname', 'lastname', 'department', 'team', 'add_to_wikimediade',]
 
 class WorkingForm(EvaForm):
 
@@ -48,17 +48,11 @@ class WorkingForm(EvaForm):
 
 class ITForm(EvaForm):
 
-    def clean(self):
-        data = self.cleaned_data
-        if data['vendor'] == 'MAC' and data['os'] != 'MOS':
-            raise ValidationError('Ein MAC sollte Mac OS installiert haben')
-        return data
-
     class Meta:
         model = Employee
         fields = [
-            'vendor', 'os', 'keyboard', 'screen', 'mobile', 'comment',
-            'language', 'accounts', 'lists', 'rebu2go' ]
+            'framework', 'os', 'keyboard', 'mobile', 'landline',
+            'comment', 'language', 'accounts', 'lists', 'rebu2go' ]
 
 class OfficeForm(EvaForm):
     class Meta:

evapp/migrations/0001_initial.py

@@ -20,6 +20,7 @@ class Migration(migrations.Migration):
                 ('lastname', models.CharField(max_length=50, verbose_name='Nachname')),
                 ('department', models.CharField(choices=[('PROG', 'Programme'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('VOR', 'Vorstand')], max_length=5, verbose_name='Bereich')),
                 ('team', models.CharField(blank=True, max_length=20, null=True)),
+                ('add_to_wikimediade', models.BooleanField(default=False, verbose_name='Soll auf wikimedia.de irgendwo stehen?')),
                 ('firstdate_employment', models.DateField(null=True, verbose_name='Erster Arbeitstag')),
                 ('firstdate_presence', models.DateField(null=True, verbose_name='Erster Tag der Anwesenheit in der Geschäftsstelle')),
                 ('jobdescription_german', models.CharField(max_length=100, null=True, verbose_name='Stellenbezeichnung(deutsch)')),
@@ -30,9 +31,10 @@ class Migration(migrations.Migration):
                 ('os', models.CharField(choices=[('UBU', 'Ubuntu (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)'), ('MOS', 'Mac OS (nur wenn Mac gewählt)')], default='UBU', max_length=3, verbose_name='Betriebssystem')),
                 ('screen', models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.')),
                 ('mobile', models.BooleanField(default=False, max_length=6, verbose_name='Diensttelefon (Handy)')),
+                ('landline', models.BooleanField(default=False, verbose_name='Festnetznummer (Sipgate)')),
                 ('keyboard', models.CharField(choices=[('DE', 'Deutsch'), ('US', 'USA'), ('OT', 'Anderes (Bitte unten angeben)')], default='DE', max_length=2, verbose_name='Tastaturlayout')),
                 ('comment', models.TextField(blank=True, max_length=500, null=True, verbose_name='zusätzliche IT-Anforderungen')),
-                ('language', models.CharField(choices=[('GER', 'Deutsch'), ('ENG', 'English')], default='GER', max_length=3, verbose_name='Sprache')),
+                ('language', models.CharField(choices=[('GER', 'Deutsch'), ('ENG', 'English')], default='GER', max_length=3, verbose_name='Sprache für Onboarding')),
                 ('accounts', multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('OTRSWMDE', 'OTRS Ticketsystem'), ('CIVIC1', 'Civic CRM (allgemein)'), ('CIVIC2', 'Civic CRM (Mailings, impliziert allgemein)'), ('WEB', 'www.wikimedia.de (edit)'), ('BLOG', 'blog.wikimedia.de (edit)'), ('FORUM', 'forum.wikimedia.de')], max_length=37, null=True, verbose_name='Zusätzliche Accounts')),
                 ('lists', models.CharField(blank=True, max_length=100, null=True, verbose_name='Zusätzliche Mailinglisten')),
                 ('rebu2go', models.BooleanField(default=False, verbose_name='Rebu2Go-Zugang benötigt?')),

evapp/migrations/0003_auto_20220208_0955.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.1.4 on 2022-02-08 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evapp', '0002_auto_20210914_1055'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='employee',
+            name='department',
+            field=models.CharField(choices=[('PROG', 'Programme'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('KOMEV', 'Kommunikation und Events'), ('VOR', 'Vorstand')], max_length=5, verbose_name='Bereich'),
+        ),
+        migrations.AlterField(
+            model_name='employee',
+            name='team',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='employee',
+            name='works_in_gs',
+            field=models.BooleanField(default=True, verbose_name='Braucht Arbeitsplatz in der Geschäftsstelle?)'),
+        ),
+    ]

evapp/migrations/0004_alter_employee_accounts_alter_employee_department.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.4 on 2023-08-11 10:28
+
+from django.db import migrations, models
+import multiselectfield.db.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evapp', '0003_auto_20220208_0955'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='employee',
+            name='accounts',
+            field=multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('OTRSWMDE', 'OTRS Ticketsystem'), ('CIVIC1', 'Civic CRM (allgemein)'), ('CIVIC2', 'Civic CRM (Mailings, impliziert allgemein)'), ('WEB', 'www.wikimedia.de (edit)'), ('BLOG', 'blog.wikimedia.de (edit)'), ('FORUM', 'forum.wikimedia.de')], max_length=10, null=True, verbose_name='Zusätzliche Accounts'),
+        ),
+        migrations.AlterField(
+            model_name='employee',
+            name='department',
+            field=models.CharField(choices=[('COENG', 'Communitys & Engagement'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('KOMAD', 'Kommunikation & Advocacy'), ('VOR', 'Vorstand')], max_length=5, verbose_name='Bereich'),
+        ),
+    ]

evapp/migrations/0005_alter_employee_accounts.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.4 on 2023-08-17 11:08
+
+from django.db import migrations
+import multiselectfield.db.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evapp', '0004_alter_employee_accounts_alter_employee_department'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='employee',
+            name='accounts',
+            field=multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('OTRSWMDE', 'OTRS Ticketsystem'), ('CIVIC1', 'Civic CRM (allgemein)'), ('CIVIC2', 'Civic CRM (Mailings, impliziert allgemein)'), ('WEB', 'www.wikimedia.de (edit)'), ('BLOG', 'blog.wikimedia.de (edit)'), ('FORUM', 'forum.wikimedia.de')], max_length=40, null=True, verbose_name='Zusätzliche Accounts'),
+        ),
+    ]

evapp/migrations/0006_remove_employee_vendor_employee_framework_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.16 on 2024-11-26 09:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evapp', '0005_alter_employee_accounts'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='employee',
+            name='vendor',
+        ),
+        migrations.AddField(
+            model_name='employee',
+            name='framework',
+            field=models.CharField(blank=True, max_length=300, null=True, verbose_name='Möchten Sie vom Standard des Frameworks abweichen, und wenn ja, warum?'),
+        ),
+        migrations.AlterField(
+            model_name='employee',
+            name='add_to_wikimediade',
+            field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default=True, max_length=5, verbose_name='Soll die Person bei Ansprechpartner*innen auf der WMDE-Webseite mit aufgenommen werden?'),
+        ),
+        migrations.AlterField(
+            model_name='employee',
+            name='os',
+            field=models.CharField(choices=[('FED', 'Fedora (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)'), ('MOS', 'Mac OS (nur wenn Mac gewählt)'), ('UBU', 'Ubuntu')], default='FED', max_length=3, verbose_name='Betriebssystem'),
+        ),
+    ]

evapp/models.py

@@ -1,44 +1,48 @@
 from django.db import models
 from multiselectfield import MultiSelectField
+from django.utils.translation import gettext_lazy as _
 
 # ATTENTION!!!
 # No key should be used twice in any of these dicts because of the
 # suboptimal implementation in views.EvaFormView.beautify_data()
 #
 
-DEPARTMENT_CHOICES = {'PROG': 'Programme',
-                      'SOFT': 'Softwareentwicklung',
+DEPARTMENT_CHOICES = {'COENG': _('Communitys & Engagement'),
+                      'SOFT': _('Softwareentwicklung'),
                       'CENT': 'Central',
-                      'KOMEV': 'Kommunikation und Events',
-                      'VOR': 'Vorstand',}
+                      'KOMAD': _('Kommunikation & Advocacy'),
+                      'VOR': _('Vorstand'),}
 
-VENDOR_CHOICES = {'STANDARD': 'Dell Latitude',
-                 'LENOVO': 'Lenovo Thinkpad',
-                 'MAC': 'Mac (nur für Grafiker_innen)'}
-
-OS_CHOICES = {'UBU': 'Ubuntu (Standard)',
-              'WIN': 'Windows (bitte Begründung angeben)',
-              'MOS': 'Mac OS (nur wenn Mac gewählt)'}
+#VENDOR_CHOICES = {'STANDARD': 'Dell Latitude',
+#                'LENOVO': 'Lenovo Thinkpad',
+#                'MAC': _('Mac (nur für Grafiker_innen)')}
 
+OS_CHOICES = {'FED': 'Fedora (Standard)',
+              'WIN': _('Windows (bitte Begründung angeben)'),
+              'MOS': _('Mac OS (nur wenn Mac gewählt)'),
+              'UBU': _('Ubuntu')}
 
 LANG_CHOICES = {'GER': 'Deutsch',
                 'ENG': 'English',}
 
 KEYBOARD_CHOICES = {'DE': 'Deutsch',
                     'US': 'USA',
-                    'OT': 'Anderes (Bitte unten angeben)'}
+                    'OT': _('Anderes (Bitte unten angeben)')}
 
 ACCOUNT_CHOICES = {'OTRSWMDE': 'OTRS Ticketsystem',
-                   'CIVIC1': 'Civic CRM (allgemein)',
-                   'CIVIC2': "Civic CRM (Mailings, impliziert allgemein)",
+                   'CIVIC1': _('Civic CRM (allgemein)'),
+                   'CIVIC2': _("Civic CRM (Mailings, impliziert allgemein)"),
                    'WEB': 'www.wikimedia.de (edit)',
                    'BLOG': 'blog.wikimedia.de (edit)',
                    'FORUM': 'forum.wikimedia.de',
                    }
 
-TRANSPONDER_CHOICES = {'NORM': 'Allgemeiner Transponder',
-                       'SPECIAL': 'Besondere Schließungen (bitte angeben)',
-                       'NOTRANS': 'Kein Transponder',}
+TRANSPONDER_CHOICES = {'NORM': _('Allgemeiner Transponder'),
+                       'SPECIAL': _('Besondere Schließungen (bitte angeben)'),
+                       'NOTRANS': _('Kein Transponder'),}
+
+JANEIN_CHOICES = {'NEIN': ('Nein'),
+           'JA': _('Ja'),}
 
 class Employee(models.Model):
 
@@ -46,34 +50,37 @@ class Employee(models.Model):
     # usermail = models.EmailField(max_length=50, verbose_name="Deine Mailadresse (Ansprechpartner_in)", default='bestechefin@wikimedia.de')
 
     # personal data
-    firstname = models.CharField(max_length=50, verbose_name="Vorname")
-    lastname = models.CharField(max_length=50, verbose_name="Nachname")
+    firstname = models.CharField(max_length=50, verbose_name=_("Vorname"))
+    lastname = models.CharField(max_length=50, verbose_name=_("Nachname"))
     # intern = models.BooleanField(verbose_name='Interne_r Mitarbeiter_in?', default=True)
-    department = models.CharField(max_length=5, choices=DEPARTMENT_CHOICES.items(), verbose_name='Bereich')
-    team = models.CharField(max_length=20, null=True, blank=True) # TODO? better with choices?
+    department = models.CharField(max_length=5, choices=DEPARTMENT_CHOICES.items(), verbose_name=_('Bereich'))
+    team = models.CharField(max_length=50, null=True, blank=True) # TODO? better with choices?
+    add_to_wikimediade = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name=_("Soll die Person bei Ansprechpartner*innen auf der WMDE-Webseite mit aufgenommen werden?"))
 
     # general work related stuff
-    firstdate_employment = models.DateField(null=True, verbose_name="Erster Arbeitstag")
-    firstdate_presence = models.DateField(null=True, verbose_name="Erster Tag der Anwesenheit in der Geschäftsstelle")
+    firstdate_employment = models.DateField(null=True, verbose_name=_("Erster Arbeitstag"))
+    firstdate_presence = models.DateField(null=True, verbose_name=_("Erster Tag der Anwesenheit in der Geschäftsstelle"))
     jobdescription_german = models.CharField(null=True, max_length=100, verbose_name="Stellenbezeichnung(deutsch)")
     jobdescription_english = models.CharField(null=True, max_length=100, verbose_name="Job description(english)")
-    works_in_gs = models.BooleanField(verbose_name='Braucht Arbeitsplatz in der Geschäftsstelle?', default=True)
-    desk = models.CharField(max_length=100, null=True, blank=True, verbose_name="Wo soll der Arbeitsplatz sein?")
+    works_in_gs = models.BooleanField(verbose_name=_('Braucht Arbeitsplatz in der Geschäftsstelle?)'), default=True)
+    desk = models.CharField(max_length=100, null=True, blank=True, verbose_name=_("Wo soll der Arbeitsplatz sein?"))
 
     # IT related stuff
-    vendor = models.CharField(max_length=8, choices=VENDOR_CHOICES.items(), default='STANDARD', verbose_name='Hersteller')
-    os = models.CharField(max_length=3, choices=OS_CHOICES.items(), default='UBU', verbose_name='Betriebssystem')
-    screen = models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.')
-    mobile = models.BooleanField(max_length=6, default=False, verbose_name='Diensttelefon (Handy)')
+    #vendor = models.CharField(max_length=8, choices=VENDOR_CHOICES.items(), default='STANDARD', verbose_name=_('Hersteller'))
+    framework = models.CharField(max_length=300, null=True, blank=True, verbose_name=_("Möchten Sie vom Standard des Frameworks (Laptop) abweichen, und wenn ja, warum?"))
+    os = models.CharField(max_length=3, choices=OS_CHOICES.items(), default='FED', verbose_name=_('Betriebssystem'))
+    #screen = models.BooleanField(default=False, verbose_name=_('Zusätzlicher Monitor? Einer ist standard.'))
+    mobile = models.BooleanField(max_length=6, default=False, verbose_name=_('Diensttelefon (Handy)'))
+    landline = models.BooleanField(default = False, verbose_name=_('Festnetznummer (Sipgate)'))
     # sim = models.BooleanField(default=False, verbose_name="Mobilfunkvertrag")
-    keyboard = models.CharField(max_length=2, choices=KEYBOARD_CHOICES.items(), default='DE', verbose_name="Tastaturlayout")
-    comment = models.TextField(max_length=500, null=True, blank=True, verbose_name="zusätzliche IT-Anforderungen")
-    language = models.CharField(max_length=3, choices=LANG_CHOICES.items(), default="GER", verbose_name="Sprache")
-    accounts = MultiSelectField(choices=ACCOUNT_CHOICES.items(), null=True, blank=True, verbose_name="Zusätzliche Accounts")
-    lists = models.CharField(max_length=100, null=True, blank=True, verbose_name="Zusätzliche Mailinglisten")
-    rebu2go = models.BooleanField(verbose_name="Rebu2Go-Zugang benötigt?", default=False)
+    keyboard = models.CharField(max_length=2, choices=KEYBOARD_CHOICES.items(), default='DE', verbose_name=_("Tastaturlayout"))
+    comment = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("zusätzliche IT-Anforderungen"))
+    language = models.CharField(max_length=3, choices=LANG_CHOICES.items(), default="GER", verbose_name=_("Sprache für Onboarding"))
+    accounts = MultiSelectField(choices=ACCOUNT_CHOICES.items(), max_length=40, null=True, blank=True, verbose_name=_("Zusätzliche Accounts"))
+    lists = models.CharField(max_length=100, null=True, blank=True, verbose_name=_("Zusätzliche Mailinglisten"))
+    rebu2go = models.BooleanField(verbose_name=_("Rebu2Go-Zugang benötigt?"), default=False)
 
     # office related stuff
     transponder = models.CharField(max_length=7, choices=TRANSPONDER_CHOICES.items(), default='NORM')
-    special = models.TextField(max_length=500, null=True, blank=True, verbose_name="Besondere Schließungen hier eintragen")
-    post_office_box = models.BooleanField(default=True, verbose_name='Postfach am Empfang benötigt?')
+    special = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("Besondere Schließungen hier eintragen"))
+    post_office_box = models.BooleanField(default=True, verbose_name=_('Postfach am Empfang benötigt?'))

evapp/settings.py

@@ -5,9 +5,11 @@ ONLY_ONBOARDING = True
 EVA_MAIL = 'it-support@wikimedia.de'
 
 # these Fields should be included in every mail
-BASIC_DATA = ['firstname', 'lastname', 'firstdate_employment', 'firstdate_presence',]
+BASIC_DATA = ['firstname', 'lastname', 'firstdate_employment', 'firstdate_presence',
+              'jobdescription_german', 'jobdescription_english',]
 
 # for every department: 'MAIL' => mail adress, 'DATA': additional fields to include
+# also one copy with all fields to the person filling the form.
 MAILS = {
             'IT': {
                 'MAIL': 'wmde-it@wikimedia.de',
@@ -20,21 +22,20 @@ MAILS = {
             'OFFICE': {
                 'MAIL': 'office@wikimedia.de',
                 'DATA': [
-                    'transponder', 'special', 'post_office_box', 'sim', 'sim2',
+                    'transponder', 'special', 'post_office_box', 'mobile',
                     'works_in_gs', 'desk',
                 ],
             },
             'KOMM': {
                 'MAIL': 'presse@wikimedia.de',
                 'DATA': [
-                    'department', 'team',
-                    'jobdescription_german', 'jobdescription_english',
+                    'department', 'team', 'add_to_wikimediade'
                 ],
             },
             'CENTRAL': {
-                'MAIL': 'eileen.miedtank@wikimedia.de',
+                'MAIL': 'anna.noelte@wikimedia.de',
                 'DATA': [
-                    'department', 'team', 'language', 'sim', 'sim2', 'rebu2go'
+                    'department', 'team', 'language', 'mobile', 'rebu2go'
                 ],
             },
             'HR': {
@@ -43,11 +44,18 @@ MAILS = {
                     'department', 'team', 'language',
                 ]
             },
-            'DIRECTORAT': {
-                'MAIL': 'ricarda.busse@wikimedia.de',
+            'FINANCE': {
+                'MAIL': 'claudia.langrock@wikimedia.de',
                 'DATA': [
-                    'team', 'department', 'language',
+                    'rebu2go'
+                ]
+            },
+            'SUBMITTER': {
+                'MAIL': 'submitter@wikimedia.de',
+                'DATA': [
+                    'department', 'team', 'add_to_wikimediade', 'remote', 'desk', 'vendor',
+                    'os', 'screen', 'mobile', 'landline', 'keyboard', 'comment', 'language',
+                    'accounts', 'lists', 'rebu2go', 'transponder', 'special', 'post_office_box'
                 ]
             }
-
         }

evapp/templates/evapp/dataloop.txt

@@ -1,4 +1,5 @@
+{% load i18n %}
 {% autoescape off %}
 {% for key, value in data.items %}{% if key == 'laptop' %} {{ key }}: {{ value | safe}}{% else %}
-{{ key }}: {{ value }}{% endif %}{% endfor %}
+{% trans key %}: {{ value }}{% endif %}{% endfor %}
 {% endautoescape %}

evapp/templates/evapp/department_mail.txt

@@ -1,3 +1,7 @@
+{% load i18n %}
+
+(english below)
+
 Hallo!
 
 Es gibt einen Neuzugang bei Wikimedia! Hier ( https://wiki.wikimedia.de/wiki/Onboarding ) kannst Du nachsehen,
@@ -9,3 +13,19 @@ die Du dafür brauchst:
 Wenn Du Fragen hast, melde Dich bei {{contact}}.
 
 Grüße, Deine E.V.A.
+
+-------------------------
+{% language 'en' %}
+Hi!
+
+There is a new employee at Wikimedia! Here ( https://wiki.wikimedia.de/wiki/Onboarding ) you can see, which
+steps are now necessary for your department.
+
+All Data you need for this:
+
+{% include 'evapp/dataloop.txt' %}
+
+If you have any questions please write to {{contact}}.
+
+Regards, Your E.V.A.
+{% endlanguage %}

evapp/templates/evapp/employee_form.html

@@ -14,6 +14,9 @@
 {% load socialaccount %}
 {% if user.is_authenticated %}
 {% block content %}
+
+{% get_current_language as LANGUAGE_CODE %}
+<!-- Current language: {{ LANGUAGE_CODE }} -->
 <center>
   <style>
     ul > li {
@@ -30,22 +33,22 @@
 
   <img src="{% static 'evapp/logo.png' %}" />
   {% if TESTMODE %}
-  <h1 style="background-color:red;color:white">WARNUNG! Test-MODUS aktiviert. Es werden keine Mails verschickt!</h1>
+  <h1 style="background-color:red;color:white">{% translate "WARNUNG! Test-MODUS aktiviert. Es werden keine Mails verschickt!" %}</h1>
   {% endif %}
   <h1>
     E (V A) - Eintritt, (Veränderung, Austritt)<p>
-  </h1>Du bist eingeloggt als {{ user.email }}
+  </h1>{% translate "Du bist eingeloggt als" %} {{ user.email }}
   <h2>
-  <p>Schritt {{ wizard.steps.step1 }} von {{ wizard.steps.count }}</p>
+  <p> {% translate "Schritt" %} {{ wizard.steps.step1 }} {% translate "von" %} {{ wizard.steps.count }}</p>
   <p>{% if wizard.steps.step1 == 1 %}
-    Angaben zur Person {% endif %}
+    {% translate "Angaben zur Person" %} {% endif %}
 {% if choice == 'IN' %}
   {% if wizard.steps.step1 == 2 %}
-    Angaben zum neuen Arbeitsverhältnis
+    {% translate "Angaben zum neuen Arbeitsverhältnis" %}
   {% elif wizard.steps.step1 == 3 %}
-    IT-relevante Angaben
+    {% translate "IT-relevante Angaben" %}
   {% elif wizard.steps.step1 == 4 %}
-    Office-relevante Angaben
+    {% translate "Office-relevante Angaben" %}
   {% endif %}
 {% else %}
   {% if wizard.steps.step1 == 2 %}
@@ -53,7 +56,7 @@
   {% endif %}
 {% endif %}
 {% if datatable == True %}
-    Bestätigungsschritt
+    {% translate "Bestätigungsschritt" %}
 {% endif %}
   </p>
   </h2>
@@ -84,21 +87,21 @@
     {% endif %}
     </table>
     <p>
-      <span style="color: red">*</span> Pflichtfeld
+      <span style="color: red">*</span> {% translate "Pflichtfeld" %}
     <p>
     {% if wizard.steps.prev %}
-    <button formnovalidate="formnovalidate" name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">Zurück</button>
+    <button formnovalidate="formnovalidate" name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">{% translate "Zurück" %}</button>
     {% endif %}
     {% if datatable == True %}
-      <button type="submit" value="{% trans "Weiter" %}">Abschicken</button>
+      <button type="submit" value="{% trans "Weiter" %}">{% translate "Abschicken" %}</button>
     {% else %}
-      <button type="submit" value="{% trans "Weiter" %}">Weiter</button>
+      <button type="submit" value="{% trans "Weiter" %}">{% translate "Weiter" %}</button>
     {% endif %}
   </form>
   <p>
-  <a href="{% url 'account_logout' %}">logout</a>
+  <a href="{% url 'account_logout' %}">{% translate "logout" %}</a>
 </center>
 {% endblock %}
 {% else %}
-<a href="{% provider_login_url 'nextcloud' %}">Bitte einloggen!</a>
+<a href="{% provider_login_url 'nextcloud' %}">{% translate "Bitte einloggen!" %}</a>
 {% endif %}

evapp/tests.py

@@ -4,6 +4,7 @@ from django.contrib.auth.models import User
 from django.conf import settings
 from django.http import HttpResponse
 from django.core import mail
+from django.utils import translation
 
 from .forms import ITForm, WorkingForm, OfficeForm, DummyForm
 
@@ -16,6 +17,12 @@ class LoginTestCase(TestCase):
 
     def testLogin(self):
         self.assertContains(self.response, 'Du bist eingeloggt als vladimir@reiherzehe.com', status_code=200)
+        response_en = self.client.get('/', HTTP_ACCEPT_LANGUAGE='en-us')
+        self.assertContains(response_en, 'You are logged in as vladimir@reiherzehe.com', status_code=200)
+        self.assertContains(response_en, 'Firstname', status_code=200)
+        response_en = self.client.get('/', HTTP_ACCEPT_LANGUAGE='en')
+        self.assertContains(response_en, 'You are logged in as vladimir@reiherzehe.com', status_code=200)
+        self.assertContains(response_en, 'Firstname', status_code=200)
 
     def testDebugWarning(self):
         with self.settings(DEBUG=True):
@@ -45,8 +52,8 @@ class LoginTestCase(TestCase):
         self.assertContains(self.response, 'Programme', status_code=200)
         self.assertContains(self.response, 'Kommunikation und Events', status_code=200)
 
-    def testWizzard(self):
-        ''' this test goes through the whole process of the EvaFormView from start to end '''
+    def test_wizzard_in(self):
+        ''' this test goes through the whole onboarding process of the EvaFormView from start to end '''
 
         self.assertEqual(200, self.response.status_code)
 
@@ -55,6 +62,8 @@ class LoginTestCase(TestCase):
                     '0-firstname': 'Ara',
                     '0-lastname': 'Seva',
                     '0-department': 'CENT',
+                    '0-team': 'Community Communications',
+                    '0-choice': 'IN',
                 }, WorkingForm)
 
         response = self._postform({
@@ -83,10 +92,17 @@ class LoginTestCase(TestCase):
                     'eva_form_view-current_step': '5',
         }, DummyForm)
 
+
+
+
     def test_mail(self):
-        self.testWizzard()
-        # print(mail.outbox)
+        self.test_wizzard_in()
+        # print(mail.outbox[0].body)
         self.assertGreater(len(mail.outbox), 2)
+        self.assertIn("Vorname", mail.outbox[0].body)
+        self.assertIn("Firstname", mail.outbox[0].body)
+        for i in (0,1,3):
+            self.assertIn("Handy", mail.outbox[i].body)
         self.assertIn("Ara Seva", mail.outbox[0].subject)
 
 class NoLoginTestCase(TestCase):

evapp/views.py

@@ -10,9 +10,10 @@ from formtools.wizard.views import CookieWizardView
 from django.shortcuts import render
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.utils.translation import gettext_lazy as _
 
-from .models import Employee, DEPARTMENT_CHOICES, OS_CHOICES, VENDOR_CHOICES, \
-                    LANG_CHOICES, ACCOUNT_CHOICES, TRANSPONDER_CHOICES, KEYBOARD_CHOICES
+from .models import Employee, DEPARTMENT_CHOICES, OS_CHOICES, \
+                    LANG_CHOICES, ACCOUNT_CHOICES, TRANSPONDER_CHOICES, KEYBOARD_CHOICES, JANEIN_CHOICES
 from .forms import PersonalForm, WorkingForm, ITForm, OfficeForm, DummyForm,\
                    ChangeForm, TYPE_CHOICES
 from .settings import MAILS, EVA_MAIL, BASIC_DATA, ONLY_ONBOARDING
@@ -28,19 +29,19 @@ def long_process(wizard):
         return True
     else:
         data = wizard.get_cleaned_data_for_step('0') or {}
-        print(data)
+        # print(data)
         if data.get('choice') != 'CHANGE':
             wizard.set_choice('IN')
-            print('PROZESS IN')
+            # print('PROZESS IN')
             return True
         else:
             wizard.set_choice('CHANGE')
-            print('PROZESS NOT IN')
+            # print('PROZESS NOT IN')
             return False
 
 def change_process(wizard):
     ''' this method is called via urls.py to determine if the form is part of the change process'''
-    print('CHANGE PROZESS')
+    # print('CHANGE PROZESS')
     return not long_process(wizard)
 
 
@@ -140,21 +141,29 @@ class EvaFormView(LoginRequiredMixin, CookieWizardView):
         context = {'data': self.beautify_data(newdata), 'contact': contact}
         firstname = data['firstname']
         lastname = data['lastname']
+        firstday = data['firstdate_employment']
         try:
              mail_template = get_template(f'evapp/department_mail.txt')
              if settings.MAILTEST:
                  send_mail(
-                 f'EVA: Neuzugang {firstname} {lastname} (MAILTEST)',
+                 f'EVA: Neuzugang {firstname} {lastname} {firstday} (MAILTEST)',
                  mail_template.render(context),
                  EVA_MAIL,
-                 [EVA_MAIL, contact],
+                 [EVA_MAIL],
+                 fail_silently=False)
+             elif department != "SUBMITTER":
+                 send_mail(
+                 f'EVA: Neuzugang {firstname} {lastname} {firstday}',
+                 mail_template.render(context),
+                 EVA_MAIL,
+                 [MAILS[department]['MAIL']],
                  fail_silently=False)
              else:
                  send_mail(
-                 f'EVA: Neuzugang {firstname} {lastname}',
+                 f'EVA: Neuzugang {firstname} {lastname} {firstday}',
                  mail_template.render(context),
                  EVA_MAIL,
-                 [MAILS[department]['MAIL'], contact],
+                 [contact],
                  fail_silently=False)
         except BadHeaderError as error:
             print(error)

locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,208 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-02-07 14:44+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: evapp/models.py:10
+msgid "Programme"
+msgstr "Programs"
+
+#: evapp/models.py:11
+msgid "Softwareentwicklung"
+msgstr "Software development"
+
+#: evapp/models.py:13
+msgid "Kommunikation und Events"
+msgstr "Communication and events"
+
+#: evapp/models.py:14
+msgid "Vorstand"
+msgstr "Board"
+
+#: evapp/models.py:18
+msgid "Mac (nur für Grafiker_innen)"
+msgstr "Mac (for graphic designer only)"
+
+#: evapp/models.py:21
+msgid "Windows (bitte Begründung angeben)"
+msgstr "Windows (please give justification)"
+
+#: evapp/models.py:22
+msgid "Mac OS (nur wenn Mac gewählt)"
+msgstr "Mac OS (only if you choose Mac)"
+
+#: evapp/models.py:30
+msgid "Anderes (Bitte unten angeben)"
+msgstr "Others (please note below)"
+
+#: evapp/models.py:33
+msgid "Civic CRM (allgemein)"
+msgstr "Civic CRM (regular)"
+
+#: evapp/models.py:34
+msgid "Civic CRM (Mailings, impliziert allgemein)"
+msgstr "Civic CRM (mailings, regular implied)"
+
+#: evapp/models.py:40
+msgid "Allgemeiner Transponder"
+msgstr "Regular Transponder"
+
+#: evapp/models.py:41
+msgid "Besondere Schließungen (bitte angeben)"
+msgstr "Special Doors (please note below)"
+
+#: evapp/models.py:42
+msgid "Kein Transponder"
+msgstr "No transponder"
+
+#: evapp/models.py:50 evapp/templates/evapp/department_mail.txt:26
+msgid "Vorname"
+msgstr "Firstname"
+
+#: evapp/models.py:51
+msgid "Nachname"
+msgstr "Lastname"
+
+#: evapp/models.py:53
+msgid "Bereich"
+msgstr "Department"
+
+#: evapp/models.py:57
+msgid "Erster Arbeitstag"
+msgstr "First workday"
+
+#: evapp/models.py:58
+msgid "Erster Tag der Anwesenheit in der Geschäftsstelle"
+msgstr "First day in the office"
+
+#: evapp/models.py:61
+msgid "Braucht Arbeitsplatz in der Geschäftsstelle?)"
+msgstr "Needs a working place in the office"
+
+#: evapp/models.py:62
+msgid "Wo soll der Arbeitsplatz sein?"
+msgstr "Where should the desk be?"
+
+#: evapp/models.py:65
+msgid "Hersteller"
+msgstr "Manufacterer"
+
+#: evapp/models.py:66
+msgid "Betriebssystem"
+msgstr "Operating system"
+
+#: evapp/models.py:67
+msgid "Zusätzlicher Monitor? Einer ist standard."
+msgstr "Additional monitor. One is standard."
+
+#: evapp/models.py:68
+msgid "Diensttelefon (Handy)"
+msgstr "work phone (mobile)"
+
+#: evapp/models.py:70
+msgid "Tastaturlayout"
+msgstr "Keyboard layout"
+
+#: evapp/models.py:71
+msgid "zusätzliche IT-Anforderungen"
+msgstr "Additional IT requirements"
+
+#: evapp/models.py:72
+msgid "Sprache"
+msgstr "Language"
+
+#: evapp/models.py:73
+msgid "Zusätzliche Accounts"
+msgstr "Additional accounts"
+
+#: evapp/models.py:74
+msgid "Zusätzliche Mailinglisten"
+msgstr "additional mailing lists"
+
+#: evapp/models.py:75
+msgid "Rebu2Go-Zugang benötigt?"
+msgstr "Needs Rebu2Go account"
+
+#: evapp/models.py:79
+msgid "Besondere Schließungen hier eintragen"
+msgstr "Special access for doors"
+
+#: evapp/models.py:80
+msgid "Postfach am Empfang benötigt?"
+msgstr "Needs mailbox at reception"
+
+#: evapp/templates/evapp/employee_form.html:36
+msgid "WARNUNG! Test-MODUS aktiviert. Es werden keine Mails verschickt!"
+msgstr "ATTENTION! Test mode activated. No mails will be send."
+
+#: evapp/templates/evapp/employee_form.html:40
+msgid "Du bist eingeloggt als"
+msgstr "You are logged in as"
+
+#: evapp/templates/evapp/employee_form.html:42
+msgid "Schritt"
+msgstr "Step"
+
+#: evapp/templates/evapp/employee_form.html:42
+msgid "von"
+msgstr "from"
+
+#: evapp/templates/evapp/employee_form.html:44
+msgid "Angaben zur Person"
+msgstr "Personal Data"
+
+#: evapp/templates/evapp/employee_form.html:47
+msgid "Angaben zum neuen Arbeitsverhältnis"
+msgstr "Details of the employment"
+
+#: evapp/templates/evapp/employee_form.html:49
+msgid "IT-relevante Angaben"
+msgstr "IT-relevant details"
+
+#: evapp/templates/evapp/employee_form.html:51
+msgid "Office-relevante Angaben"
+msgstr "Office relevant details"
+
+#: evapp/templates/evapp/employee_form.html:59
+msgid "Bestätigungsschritt"
+msgstr "Confirmation step"
+
+#: evapp/templates/evapp/employee_form.html:91
+msgid "Pflichtfeld"
+msgstr "Required field"
+
+#: evapp/templates/evapp/employee_form.html:94
+msgid "Zurück"
+msgstr "Back"
+
+#: evapp/templates/evapp/employee_form.html:97
+#: evapp/templates/evapp/employee_form.html:99
+msgid "Weiter"
+msgstr "Next"
+
+#: evapp/templates/evapp/employee_form.html:97
+msgid "Abschicken"
+msgstr "Send"
+
+#: evapp/templates/evapp/employee_form.html:103
+msgid "logout"
+msgstr "logout"
+
+#: evapp/templates/evapp/employee_form.html:107
+msgid "Bitte einloggen!"
+msgstr "Please log in!"