Merge branch 'master' into 241-allow-matching-primary-groups-on-arbitrary-field

aleksis/core/locale/de_DE/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-28 13:31+0000\n"
+"POT-Creation-Date: 2020-05-03 10: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"
@@ -17,14 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: static/js/main.js:21
+#: aleksis/core/static/js/main.js:21
 msgid "Today"
 msgstr ""
 
-#: static/js/main.js:22
+#: aleksis/core/static/js/main.js:22
 msgid "Cancel"
 msgstr ""
 
-#: static/js/main.js:23
+#: aleksis/core/static/js/main.js:23
 msgid "OK"
 msgstr ""

aleksis/core/locale/fr/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-28 13:31+0000\n"
+"POT-Creation-Date: 2020-05-03 10: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"
@@ -18,14 +18,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: static/js/main.js:21
+#: aleksis/core/static/js/main.js:21
 msgid "Today"
 msgstr ""
 
-#: static/js/main.js:22
+#: aleksis/core/static/js/main.js:22
 msgid "Cancel"
 msgstr ""
 
-#: static/js/main.js:23
+#: aleksis/core/static/js/main.js:23
 msgid "OK"
 msgstr ""

aleksis/core/preferences.py

@@ -121,14 +121,12 @@ class ImprintURL(StringPreference):
 class AdressingNameFormat(ChoicePreference):
     section = notification
     name = "addressing_name_format"
-    default = "german"
+    default = "first_last"
     required = False
     verbose_name = _("Name format for addressing")
     choices = (
-        (None, "-----"),
-        ("german", "John Doe"),
-        ("english", "Doe, John"),
-        ("dutch", "Doe John"),
+        ("first_last", "John Doe"),
+        ("last_fist", "Doe, John"),
     )
 
 

tox.ini

@@ -4,7 +4,8 @@ skip_missing_interpreters = true
 envlist = py37,py38
 
 [testenv]
-whitelist_externals = poetry, sudo
+whitelist_externals = poetry
+		      sudo
 skip_install = true
 envdir = {toxworkdir}/globalenv
 commands_pre =