admin: Show deleted users in circle members

This helps with removing those users from circles, to avoid them popping up in peoples roster again. Even though removal from a circle also only partially works (roster entries are for instance not cleared), this helps with ghost users reappearing all the time.
Merge pull request #87 from snikket-im/feature/mypy-ci-fix
2021-06-18 16:18:22 +02:00 · 2021-06-18 16:18:12 +02:00 · 2021-06-18 16:14:45 +02:00 · 2021-06-18 16:11:22 +02:00 · 2021-06-18 14:05:55 +00:00 · 2021-06-18 16:05:38 +02:00
18 changed files with 96 additions and 43 deletions
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -27,6 +27,7 @@ jobs:
          set -euo pipefail
          pip install mypy
          pip install -r requirements.txt
+          pip install -r build-requirements.txt
      - name: Typecheck
        run: |
          python -m mypy --config mypy.ini -p snikket_web
--- a/build-requirements.txt
+++ b/build-requirements.txt
@@ -1,3 +1,4 @@
 pyscss~=1.3
 mypy
 python-dotenv~=0.15
+types-toml
--- a/snikket_web/init.py
+++ b/snikket_web/init.py
@@ -173,7 +173,7 @@ def create_app() -> quart.Quart:
        pass
    else:
        import runpy
-        init_vars = runpy.run_path(env_init)  # type:ignore
+        init_vars = runpy.run_path(env_init)
        for name, value in init_vars.items():
            if not name:
                continue
--- a/snikket_web/admin.py
+++ b/snikket_web/admin.py
@@ -485,21 +485,21 @@ async def edit_circle(id_: str) -> typing.Union[str, quart.Response]:
                return redirect(url_for(".circles"))
            raise

-        users = sorted(
-            await client.list_users(),
-            key=lambda x: x.localpart
-        )
+        users = {
+            user.localpart: user
+            for user in await client.list_users()
+        }
        circle_members = [
-            user for user in users
-            if user.localpart in circle.members
+            (localpart, users.get(localpart))
+            for localpart in sorted(circle.members)
        ]

    form = EditCircleForm()
-    form.user_to_add.choices = [
-        (user.localpart, user.localpart)
-        for user in users
-        if user.localpart not in circle.members
-    ]
+    form.user_to_add.choices = sorted(
+        (localpart, localpart)
+        for localpart in users.keys()
+        if localpart not in circle.members
+    )
    valid_users = [x[0] for x in form.user_to_add.choices]

    invite_form = InvitePost()
--- a/snikket_web/templates/admin_edit_circle.html
+++ b/snikket_web/templates/admin_edit_circle.html
@@ -1,5 +1,5 @@
 {% extends "admin_app.html" %}
-{% from "library.j2" import form_button, standard_button, value_or_hint, custom_form_button, clipboard_button %}
+{% from "library.j2" import form_button, standard_button, value_or_hint, custom_form_button, clipboard_button, icon %}
 {% block head_lead %}
 {{ super() }}
 {% include "copy-snippet.html" %}
@@ -56,14 +56,21 @@
 {%- if circle_members -%}
 <div class="el-2 elevated"><table>
 	<thead>
-		<th>Login name</th>
-		<th class="collapsible">Display name</th>
-		<th>Actions</th>
+		<th>{% trans %}Login name{% endtrans %}</th>
+		<th class="collapsible">{% trans %}Display name{% endtrans %}</th>
+		<th>{% trans %}Actions{% endtrans %}</th>
 	</thead>
 	<tbody>
-{%- for member in circle_members -%}
+{%- for localpart, member in circle_members -%}
 		<tr>
-			<td>{{ member.localpart }}</td>
+			<td>
+				{%- if member -%}
+				{{ localpart }}
+				{%- else -%}
+				{{ localpart }}
+				<span class="with-tooltip above" data-tooltip="{% trans %}The user has been deleted from the server.{% endtrans %}"><em> ({% trans %}deleted{% endtrans %})</em></span>
+				{%- endif -%}
+			</td>
 			<td class="collapsible">{% call value_or_hint(member.display_name) %}{% endcall %}</td>
 			<td class="nowrap">
 				{%- call custom_form_button("remove_user", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%}
--- a/snikket_web/translations/da/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/da/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-04-02 19:01+0000\n"
 "Last-Translator: Daniel Holmgaard <annoncer@protonmail.com>\n"
 "Language-Team: Danish <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr "Begrænset"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Login-navn"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Kaldenavn"
@@ -465,6 +467,7 @@ msgid "Members"
 msgstr "Medlemmer"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/de/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SnikketWeb 0.1.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-05-18 13:28+0000\n"
 "Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
 "Language-Team: German <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr "Eingeschränkt"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Anmeldename"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Anzeigename"
@@ -466,6 +468,7 @@ msgid "Members"
 msgstr "Mitglieder"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/en/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-02-02 21:01+0000\n"
 "Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
 "Language-Team: English <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr ""

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Login name"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Display name"
@@ -509,6 +511,7 @@ msgid "Members"
 msgstr "Members"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/en_GB/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-02-02 21:01+0000\n"
 "Last-Translator: riccio <unriccio@email.it>\n"
 "Language-Team: English (United Kingdom) <https://i18n.sotecware.net/projects/"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr ""

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Login name"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Display name"
@@ -508,6 +510,7 @@ msgid "Members"
 msgstr "Members"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/es_MX/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/es_MX/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-03-31 13:00+0000\n"
 "Last-Translator: Tilman Jiménez <tilman.jimenez@tu-dortmund.de>\n"
 "Language-Team: Spanish (Mexico) <https://i18n.sotecware.net/projects/snikket/"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr "Limitado"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Nombre de ingreso del usuario"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Nombre mostrado"
@@ -488,6 +490,7 @@ msgid "Members"
 msgstr "Miembros"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/fr/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-05-27 18:31+0000\n"
 "Last-Translator: Link Mauve <linkmauve@linkmauve.fr>\n"
 "Language-Team: French <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr "Limité"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Identifiant"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Nom à afficher"
@@ -465,6 +467,7 @@ msgid "Members"
 msgstr "Membres"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/id/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/id/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-05-19 15:12+0000\n"
 "Last-Translator: uira <inboxriau@andriana.id>\n"
 "Language-Team: Indonesian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr "Terbatas"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Nama login"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Nama tampilan"
@@ -467,6 +469,7 @@ msgid "Members"
 msgstr "Anggota"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/it/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-05-19 15:12+0000\n"
 "Last-Translator: Roberto Resoli <roberto@resolutions.it>\n"
 "Language-Team: Italian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr "Limitato"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Nome utente"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Nome visualizzato"
@@ -466,6 +468,7 @@ msgid "Members"
 msgstr "Membri"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/ja/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-01-28 17:55+0000\n"
 "Last-Translator: pep <pep@bouah.net>\n"
 "Language-Team: Japanese <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr ""

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "ロゲイン名"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "表示名"
@@ -493,6 +495,7 @@ msgid "Members"
 msgstr "サークル員"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/messages.pot
+++ b/snikket_web/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\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"
@@ -22,11 +22,13 @@ msgid "Limited"
 msgstr ""

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr ""

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr ""
@@ -440,6 +442,7 @@ msgid "Members"
 msgstr ""

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
@@ -588,28 +591,37 @@ msgstr ""
 msgid "Circle members"
 msgstr ""

-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr ""

-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr ""

-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr ""

-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr ""

-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr ""

-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr ""

@@ -1313,10 +1325,6 @@ msgstr ""
 msgid "Invalid input"
 msgstr ""

-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr ""
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
--- a/snikket_web/translations/pl/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/pl/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-05-19 15:12+0000\n"
 "Last-Translator: misiek <migelazur@mailbox.org>\n"
 "Language-Team: Polish <https://i18n.sotecware.net/projects/snikket/web-"
@@ -26,11 +26,13 @@ msgid "Limited"
 msgstr "Ograniczony"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Login"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Nazwa wyświetlana"
@@ -467,6 +469,7 @@ msgid "Members"
 msgstr "Członkowie"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/ru/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-03-12 23:04+0000\n"
 "Last-Translator: GodGoldfish <godgoldfish@pm.me>\n"
 "Language-Team: Russian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -26,11 +26,13 @@ msgid "Limited"
 msgstr ""

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Логин"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Отображаемое имя"
@@ -488,6 +490,7 @@ msgid "Members"
 msgstr "Участники"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
--- a/snikket_web/translations/sv/LC_MESSAGES/messages.po
+++ b/snikket_web/translations/sv/LC_MESSAGES/messages.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-27 17:59+0200\n"
+"POT-Creation-Date: 2021-06-18 16:05+0200\n"
 "PO-Revision-Date: 2021-05-28 21:00+0000\n"
 "Last-Translator: Kim Alvefur <zash@zash.se>\n"
-"Language-Team: Swedish <https://i18n.sotecware.net/projects/snikket/"
-"web-portal/sv/>\n"
+"Language-Team: Swedish <https://i18n.sotecware.net/projects/snikket/web-"
+"portal/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,13 @@ msgid "Limited"
 msgstr "Begränsad"

 #: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10
+#: snikket_web/templates/admin_edit_circle.html:59
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr "Inloggningsnamn"

 #: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
 msgid "Display name"
 msgstr "Visningsnamn"
@@ -464,6 +466,7 @@ msgid "Members"
 msgstr "Medlemmar"

 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
Author	SHA1	Message	Date
Jonas Schäfer	3d62efccfc	admin: Show deleted users in circle members This helps with removing those users from circles, to avoid them popping up in peoples roster again. Even though removal from a circle also only partially works (roster entries are for instance not cleared), this helps with ghost users reappearing all the time.	2021-06-18 16:18:22 +02:00
Jonas Schäfer	9d26e39025	Merge pull request #87 from snikket-im/feature/mypy-ci-fix Install build requirements for mypy CI check	2021-06-18 16:18:12 +02:00
Jonas Schäfer	874f0447ba	Install build requirements for mypy CI check Otherwise, the toml type hints are missing which mypy does not like.	2021-06-18 16:14:45 +02:00
Jonas Schäfer	0f2127a672	Bring happiness to mypy	2021-06-18 16:11:22 +02:00
Weblate	20d84e7dd1	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: Snikket/Web Portal Translate-URL: https://i18n.sotecware.net/projects/snikket/web-portal/	2021-06-18 14:05:55 +00:00
Jonas Schäfer	a02e66023c	Fix missing extract_translations run	2021-06-18 16:05:38 +02:00
Jonas Schäfer	e7db9cc772	Fix untranslated table header in admin_edit_circle.html	2021-06-17 17:02:26 +02:00
Jonas Schäfer	e91fb45374	Merge pull request #85 from snikket-im/auto-versioning Automatically determine version from build info or git	2021-05-31 17:51:59 +02:00