Changes op server -> repo

[yorickvP]

git diff op kninfra op de server geeft allemaal dingen, die kunnen beter in de repo (zie ook welkomsmail)

[yorickvP]

diff --git a/kn/leden/templates/leden/welcome.mail.html b/kn/leden/templates/leden/welcome.mail.html
index ff34a77b..6c727e78 100644
--- a/kn/leden/templates/leden/welcome.mail.html
+++ b/kn/leden/templates/leden/welcome.mail.html
@@ -25,7 +25,7 @@ overgenomen. Kun je controleren of deze kloppen?</p>

 <p>Bij voorbaat dank,</p>

-<p>Bas van Wijk</p>
+<p>Tanja van Alfen</p>
 {% endblocktrans %}

diff --git a/kn/planning/entities.py b/kn/planning/entities.py
index 534bb59d..2d940dc9 100644
--- a/kn/planning/entities.py
+++ b/kn/planning/entities.py
@@ -10,7 +10,7 @@ pcol = db['planning_pools']
 ecol = db['planning_events']
 vcol = db['planning_vacancies']

-PLANNER_GROUPS = {'bestuur', 'barco', 'disco', 'chef', 'secretariaat'}
+PLANNER_GROUPS = {'bestuur', 'barco', 'disco', 'chef', 'secretariaat', 'sooscie'}

 def may_manage_planning(user):
diff --git a/kn/utils/hans/sync.py b/kn/utils/hans/sync.py
index b19ed4fc..d23ab282 100644
--- a/kn/utils/hans/sync.py
+++ b/kn/utils/hans/sync.py
@@ -62,7 +62,10 @@ def maillist_apply_changes(changes):
             for em in changes.add[l].emails:
                 pw = mailman.Utils.MakeRandomPassword()
                 desc = mailman.UserDesc.UserDesc(em, '', pw, False)
-                mlo[l].ApprovedAddMember(desc, False, False)
+                try:
+                    mlo[l].ApprovedAddMember(desc, False, False)
+                except Exception as e: # TODO remove me
+                    pass
         for l in changes.remove:
             if not ensure_opened(l):
                 continue

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 73b9a096..9f9f3085 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -1661,7 +1661,7 @@ msgid ""
 "\n"
 "Bij voorbaat dank,\n"
 "\n"
-"  Bas van Wijk\n"
+"  Niels Boer\n"
 msgstr ""

 #: kn/leden/templates/leden/welcome.mail.txt:32
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 7c6c7fdb..45636ced 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -1749,7 +1749,7 @@ msgid ""
 "\n"
 "Bij voorbaat dank,\n"
 "\n"
-"  Bas van Wijk\n"
+"  Niels Boer\n"
 msgstr ""
 "\\\n"
 "Welcome to Karpe Noktem!\n"
@@ -1759,7 +1759,7 @@ msgstr ""
 "\n"
 "Thanks in advance,\n"
 "\n"
-"  Bas van Wijk\n"
+"  Niels Boer\n"

 #: kn/leden/templates/leden/welcome.mail.txt:32
 msgid "Personalia"
diff --git a/utils/prepare-for-the-next-year.py b/utils/prepare-for-the-next-year.py
index 7bea8a30..86fb92dc 100644
--- a/utils/prepare-for-the-next-year.py
+++ b/utils/prepare-for-the-next-year.py
@@ -130,7 +130,7 @@ def main():
         if r['from'] >= datetime.datetime(today.year, 7, 1):
             continue  # Only just became a member, don't remove.
         until = datetime.datetime(today.year, 8, 31, 23, 59, 59)
-        print(' {:25} from {:26} until None -> {}'.format(member.humanName, str(r['from']), str(until)))
+        print(u' {:25} from {:26} until None -> {}'.format(member.humanName, str(r['from']), str(until)))
         if args.apply:
             r['until'] = until
             Es.rcol.save(r)

[yorickvP]

Ik heb de sooscie gefixed in 0e3775311d0b3cb01e32ad2134c22dce4911e13a, de .po files in #530. Ondertussen zijn er 2 files bijgekomen:

• kn/static/media/slideshow/bizarbecue.jpg
• kn/static/media/slideshow/zusjeskamp.jpg

[yorickvP]

Alles gecommit