Compare commits

...

8 Commits

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
18 changed files with 96 additions and 43 deletions

View File

@@ -27,6 +27,7 @@ jobs:
set -euo pipefail set -euo pipefail
pip install mypy pip install mypy
pip install -r requirements.txt pip install -r requirements.txt
pip install -r build-requirements.txt
- name: Typecheck - name: Typecheck
run: | run: |
python -m mypy --config mypy.ini -p snikket_web python -m mypy --config mypy.ini -p snikket_web

View File

@@ -1,3 +1,4 @@
pyscss~=1.3 pyscss~=1.3
mypy mypy
python-dotenv~=0.15 python-dotenv~=0.15
types-toml

View File

@@ -173,7 +173,7 @@ def create_app() -> quart.Quart:
pass pass
else: else:
import runpy 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(): for name, value in init_vars.items():
if not name: if not name:
continue continue

View File

@@ -485,21 +485,21 @@ async def edit_circle(id_: str) -> typing.Union[str, quart.Response]:
return redirect(url_for(".circles")) return redirect(url_for(".circles"))
raise raise
users = sorted( users = {
await client.list_users(), user.localpart: user
key=lambda x: x.localpart for user in await client.list_users()
) }
circle_members = [ circle_members = [
user for user in users (localpart, users.get(localpart))
if user.localpart in circle.members for localpart in sorted(circle.members)
] ]
form = EditCircleForm() form = EditCircleForm()
form.user_to_add.choices = [ form.user_to_add.choices = sorted(
(user.localpart, user.localpart) (localpart, localpart)
for user in users for localpart in users.keys()
if user.localpart not in circle.members if localpart not in circle.members
] )
valid_users = [x[0] for x in form.user_to_add.choices] valid_users = [x[0] for x in form.user_to_add.choices]
invite_form = InvitePost() invite_form = InvitePost()

View File

@@ -1,5 +1,5 @@
{% extends "admin_app.html" %} {% 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 %} {% block head_lead %}
{{ super() }} {{ super() }}
{% include "copy-snippet.html" %} {% include "copy-snippet.html" %}
@@ -56,14 +56,21 @@
{%- if circle_members -%} {%- if circle_members -%}
<div class="el-2 elevated"><table> <div class="el-2 elevated"><table>
<thead> <thead>
<th>Login name</th> <th>{% trans %}Login name{% endtrans %}</th>
<th class="collapsible">Display name</th> <th class="collapsible">{% trans %}Display name{% endtrans %}</th>
<th>Actions</th> <th>{% trans %}Actions{% endtrans %}</th>
</thead> </thead>
<tbody> <tbody>
{%- for member in circle_members -%} {%- for localpart, member in circle_members -%}
<tr> <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="collapsible">{% call value_or_hint(member.display_name) %}{% endcall %}</td>
<td class="nowrap"> <td class="nowrap">
{%- call custom_form_button("remove_user", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%} {%- call custom_form_button("remove_user", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%}

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-04-02 19:01+0000\n"
"Last-Translator: Daniel Holmgaard <annoncer@protonmail.com>\n" "Last-Translator: Daniel Holmgaard <annoncer@protonmail.com>\n"
"Language-Team: Danish <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: Danish <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "Begrænset" msgstr "Begrænset"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Login-navn" msgstr "Login-navn"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Kaldenavn" msgstr "Kaldenavn"
@@ -465,6 +467,7 @@ msgid "Members"
msgstr "Medlemmer" msgstr "Medlemmer"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SnikketWeb 0.1.0\n" "Project-Id-Version: SnikketWeb 0.1.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-05-18 13:28+0000\n"
"Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n" "Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
"Language-Team: German <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: German <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "Eingeschränkt" msgstr "Eingeschränkt"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Anmeldename" msgstr "Anmeldename"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Anzeigename" msgstr "Anzeigename"
@@ -466,6 +468,7 @@ msgid "Members"
msgstr "Mitglieder" msgstr "Mitglieder"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-02-02 21:01+0000\n"
"Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n" "Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
"Language-Team: English <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: English <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "" msgstr ""
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Login name" msgstr "Login name"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Display name" msgstr "Display name"
@@ -509,6 +511,7 @@ msgid "Members"
msgstr "Members" msgstr "Members"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-02-02 21:01+0000\n"
"Last-Translator: riccio <unriccio@email.it>\n" "Last-Translator: riccio <unriccio@email.it>\n"
"Language-Team: English (United Kingdom) <https://i18n.sotecware.net/projects/" "Language-Team: English (United Kingdom) <https://i18n.sotecware.net/projects/"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "" msgstr ""
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Login name" msgstr "Login name"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Display name" msgstr "Display name"
@@ -508,6 +510,7 @@ msgid "Members"
msgstr "Members" msgstr "Members"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-03-31 13:00+0000\n"
"Last-Translator: Tilman Jiménez <tilman.jimenez@tu-dortmund.de>\n" "Last-Translator: Tilman Jiménez <tilman.jimenez@tu-dortmund.de>\n"
"Language-Team: Spanish (Mexico) <https://i18n.sotecware.net/projects/snikket/" "Language-Team: Spanish (Mexico) <https://i18n.sotecware.net/projects/snikket/"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "Limitado" msgstr "Limitado"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Nombre de ingreso del usuario" msgstr "Nombre de ingreso del usuario"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Nombre mostrado" msgstr "Nombre mostrado"
@@ -488,6 +490,7 @@ msgid "Members"
msgstr "Miembros" msgstr "Miembros"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-05-27 18:31+0000\n"
"Last-Translator: Link Mauve <linkmauve@linkmauve.fr>\n" "Last-Translator: Link Mauve <linkmauve@linkmauve.fr>\n"
"Language-Team: French <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: French <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "Limité" msgstr "Limité"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Identifiant" msgstr "Identifiant"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Nom à afficher" msgstr "Nom à afficher"
@@ -465,6 +467,7 @@ msgid "Members"
msgstr "Membres" msgstr "Membres"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-05-19 15:12+0000\n"
"Last-Translator: uira <inboxriau@andriana.id>\n" "Last-Translator: uira <inboxriau@andriana.id>\n"
"Language-Team: Indonesian <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: Indonesian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "Terbatas" msgstr "Terbatas"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Nama login" msgstr "Nama login"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Nama tampilan" msgstr "Nama tampilan"
@@ -467,6 +469,7 @@ msgid "Members"
msgstr "Anggota" msgstr "Anggota"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-05-19 15:12+0000\n"
"Last-Translator: Roberto Resoli <roberto@resolutions.it>\n" "Last-Translator: Roberto Resoli <roberto@resolutions.it>\n"
"Language-Team: Italian <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: Italian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "Limitato" msgstr "Limitato"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Nome utente" msgstr "Nome utente"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Nome visualizzato" msgstr "Nome visualizzato"
@@ -466,6 +468,7 @@ msgid "Members"
msgstr "Membri" msgstr "Membri"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-01-28 17:55+0000\n"
"Last-Translator: pep <pep@bouah.net>\n" "Last-Translator: pep <pep@bouah.net>\n"
"Language-Team: Japanese <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: Japanese <https://i18n.sotecware.net/projects/snikket/web-"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "" msgstr ""
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "ロゲイン名" msgstr "ロゲイン名"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "表示名" msgstr "表示名"
@@ -493,6 +495,7 @@ msgid "Members"
msgstr "サークル員" msgstr "サークル員"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,11 +22,13 @@ msgid "Limited"
msgstr "" msgstr ""
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "" msgstr ""
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "" msgstr ""
@@ -440,6 +442,7 @@ msgid "Members"
msgstr "" msgstr ""
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"
@@ -588,28 +591,37 @@ msgstr ""
msgid "Circle members" msgid "Circle members"
msgstr "" 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 #, python-format
msgid "Remove user %(username)s from circle" msgid "Remove user %(username)s from circle"
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_circle.html:78 #: snikket_web/templates/admin_edit_circle.html:85
msgid "This circle currently has no members." msgid "This circle currently has no members."
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_circle.html:80 #: snikket_web/templates/admin_edit_circle.html:87
msgid "Invite more members" msgid "Invite more members"
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_circle.html:83 #: snikket_web/templates/admin_edit_circle.html:90
msgid "Add existing user" msgid "Add existing user"
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_circle.html:94 #: snikket_web/templates/admin_edit_circle.html:101
msgid "All users added" msgid "All users added"
msgstr "" 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." msgid "All users on this service are already in this circle."
msgstr "" msgstr ""
@@ -1313,10 +1325,6 @@ msgstr ""
msgid "Invalid input" msgid "Invalid input"
msgstr "" msgstr ""
#: snikket_web/templates/library.j2:108
msgid "deleted"
msgstr ""
#: snikket_web/templates/library.j2:122 #: snikket_web/templates/library.j2:122
msgid "Can be used multiple times to create accounts on this Snikket service." msgid "Can be used multiple times to create accounts on this Snikket service."
msgstr "" msgstr ""

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-05-19 15:12+0000\n"
"Last-Translator: misiek <migelazur@mailbox.org>\n" "Last-Translator: misiek <migelazur@mailbox.org>\n"
"Language-Team: Polish <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: Polish <https://i18n.sotecware.net/projects/snikket/web-"
@@ -26,11 +26,13 @@ msgid "Limited"
msgstr "Ograniczony" msgstr "Ograniczony"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Login" msgstr "Login"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Nazwa wyświetlana" msgstr "Nazwa wyświetlana"
@@ -467,6 +469,7 @@ msgid "Members"
msgstr "Członkowie" msgstr "Członkowie"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-03-12 23:04+0000\n"
"Last-Translator: GodGoldfish <godgoldfish@pm.me>\n" "Last-Translator: GodGoldfish <godgoldfish@pm.me>\n"
"Language-Team: Russian <https://i18n.sotecware.net/projects/snikket/web-" "Language-Team: Russian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -26,11 +26,13 @@ msgid "Limited"
msgstr "" msgstr ""
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Логин" msgstr "Логин"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Отображаемое имя" msgstr "Отображаемое имя"
@@ -488,6 +490,7 @@ msgid "Members"
msgstr "Участники" msgstr "Участники"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"

View File

@@ -7,11 +7,11 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2021-05-28 21:00+0000\n"
"Last-Translator: Kim Alvefur <zash@zash.se>\n" "Last-Translator: Kim Alvefur <zash@zash.se>\n"
"Language-Team: Swedish <https://i18n.sotecware.net/projects/snikket/" "Language-Team: Swedish <https://i18n.sotecware.net/projects/snikket/web-"
"web-portal/sv/>\n" "portal/sv/>\n"
"Language: sv\n" "Language: sv\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,13 @@ msgid "Limited"
msgstr "Begränsad" msgstr "Begränsad"
#: snikket_web/admin.py:71 snikket_web/templates/admin_delete_user.html:10 #: 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 #: snikket_web/templates/admin_users.html:8
msgid "Login name" msgid "Login name"
msgstr "Inloggningsnamn" msgstr "Inloggningsnamn"
#: snikket_web/admin.py:75 snikket_web/templates/admin_delete_user.html:12 #: 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 #: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
msgid "Display name" msgid "Display name"
msgstr "Visningsnamn" msgstr "Visningsnamn"
@@ -464,6 +466,7 @@ msgid "Members"
msgstr "Medlemmar" msgstr "Medlemmar"
#: snikket_web/templates/admin_circles.html:15 #: 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_invites.html:24
#: snikket_web/templates/admin_users.html:10 #: snikket_web/templates/admin_users.html:10
msgid "Actions" msgid "Actions"