Merge branch 'django3' of https://github.com/c-base/cbmi into django3

account/locale/de/LC_MESSAGES/django.po

@@ -51,7 +51,7 @@ msgstr "WLAN-Präsenzerkennung einschalten"
 
 #: forms.py:68
 msgid "Old password"
-msgstr "Neues Passwort"
+msgstr "Altes Passwort"
 
 #: forms.py:69
 msgid "Enter your current password here."

account/password_encryption.py

@@ -26,7 +26,7 @@ def encrypt_ldap_password(cleartext_pw):
 
     # do the encryption
     aes = AES.new(key, AES.MODE_CFB, iv)
-    message = iv + aes.encrypt(cleartext_pw)
+    message = iv + aes.encrypt(cleartext_pw.encode())
     return base64.b64encode(message).decode(), base64.b64encode(key).decode()
 
 
@@ -46,7 +46,7 @@ def decrypt_ldap_password(message, key):
 
     # decrypt it
     aes = AES.new(decoded_key, AES.MODE_CFB, iv)
-    cleartext_pw = aes.decrypt(ciphertext)
+    cleartext_pw = aes.decrypt(ciphertext).decode()
     return cleartext_pw