Merge pull request #1408 from bookwyrm-social/admin-tweaks

Admin tweaks
This commit is contained in:
Mouse Reeve 2021-09-12 10:33:38 -07:00 committed by GitHub
commit 09de7fe647
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 261 additions and 149 deletions

View file

@ -14,40 +14,46 @@
{% include 'settings/announcement_form.html' with controls_text="create_announcement" %}
</form>
<table class="table is-striped">
<tr>
<th>
{% url 'settings-announcements' as url %}
{% trans "Date added" as text %}
{% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
</th>
<th>
{% trans "Preview" as text %}
{% include 'snippets/table-sort-header.html' with field="preview" sort=sort text=text %}
</th>
<th>
{% trans "Start date" as text %}
{% include 'snippets/table-sort-header.html' with field="start_date" sort=sort text=text %}
</th>
<th>
{% trans "End date" as text %}
{% include 'snippets/table-sort-header.html' with field="end_date" sort=sort text=text %}
</th>
<th>
{% trans "Status" as text %}
{% include 'snippets/table-sort-header.html' with field="active" sort=sort text=text %}
</th>
</tr>
{% for announcement in announcements %}
<tr>
<td>{{ announcement.created_date|naturalday }}</td>
<td><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.preview }}</a></td>
<td>{{ announcement.start_date|naturaltime|default:'' }}</td>
<td>{{ announcement.end_date|naturaltime|default:'' }}</td>
<td>{% if announcement.active %}{% trans "active" %}{% else %}{% trans "inactive" %}{% endif %}</td>
</tr>
{% endfor %}
</table>
<div class="block">
<table class="table is-striped">
<tr>
<th>
{% url 'settings-announcements' as url %}
{% trans "Date added" as text %}
{% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
</th>
<th>
{% trans "Preview" as text %}
{% include 'snippets/table-sort-header.html' with field="preview" sort=sort text=text %}
</th>
<th>
{% trans "Start date" as text %}
{% include 'snippets/table-sort-header.html' with field="start_date" sort=sort text=text %}
</th>
<th>
{% trans "End date" as text %}
{% include 'snippets/table-sort-header.html' with field="end_date" sort=sort text=text %}
</th>
<th>
{% trans "Status" as text %}
{% include 'snippets/table-sort-header.html' with field="active" sort=sort text=text %}
</th>
</tr>
{% for announcement in announcements %}
<tr>
<td>{{ announcement.created_date|naturalday }}</td>
<td><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.preview }}</a></td>
<td>{{ announcement.start_date|naturaltime|default:'' }}</td>
<td>{{ announcement.end_date|naturaltime|default:'' }}</td>
<td>{% if announcement.active %}{% trans "active" %}{% else %}{% trans "inactive" %}{% endif %}</td>
</tr>
{% endfor %}
</table>
{% if not announcements %}
<p><em>{% trans "No announcements found." %}</em></p>
{% endif %}
</div>
{% include 'snippets/pagination.html' with page=announcements path=request.path %}
{% endblock %}

View file

@ -22,10 +22,9 @@
<tr>
{% url 'settings-federation' as url %}
<th>
{% trans "Domain" as text %}
{% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %}
{% trans "Domain" %}
</th>
<th></th>
<th>{% trans "Users" %}</th>
<th>
{% trans "Options" %}
</th>

View file

@ -33,13 +33,16 @@
{% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %}
</th>
<th>
{% trans "Date federated" as text %}
{% trans "Date added" as text %}
{% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
</th>
<th>
{% trans "Software" as text %}
{% include 'snippets/table-sort-header.html' with field="application_type" sort=sort text=text %}
</th>
<th>
{% trans "Users" %}
</th>
<th>{% trans "Status" %}</th>
</tr>
{% for server in servers %}
@ -52,6 +55,7 @@
{% if server.application_version %}({{ server.application_version }}){% endif %}
{% endif %}
</td>
<td>{{ server.user_set.count }}</td>
<td>{{ server.get_status_display }}</td>
</tr>
{% endfor %}

View file

@ -29,7 +29,7 @@ class Federation(View):
sort = request.GET.get("sort")
sort_fields = ["created_date", "application_type", "server_name"]
if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
sort = "created_date"
sort = "-created_date"
servers = servers.order_by(sort)
paginated = Paginator(servers, PAGE_LENGTH)

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-11 20:58+0000\n"
"POT-Creation-Date: 2021-09-12 17:16+0000\n"
"PO-Revision-Date: 2021-03-02 17:19-0800\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: English <LL@li.org>\n"
@ -84,6 +84,14 @@ msgstr "Zu lesen angefangen"
msgid "Descending"
msgstr "Zu lesen angefangen"
#: bookwyrm/importers/importer.py:75
msgid "Error loading book"
msgstr ""
#: bookwyrm/importers/importer.py:88
msgid "Could not find a match for book"
msgstr ""
#: bookwyrm/models/base_model.py:13
#, fuzzy
#| msgid "Started reading"
@ -112,12 +120,14 @@ msgstr ""
#: bookwyrm/models/federated_server.py:11
#: bookwyrm/templates/settings/edit_server.html:40
#: bookwyrm/templates/settings/federation.html:19
msgid "Federated"
msgstr "Föderiert"
#: bookwyrm/models/federated_server.py:12
#: bookwyrm/templates/settings/edit_server.html:41
#: bookwyrm/templates/settings/federated_server.html:10
#: bookwyrm/templates/settings/federation.html:23
#, fuzzy
#| msgid "Blocked Users"
msgid "Blocked"
@ -1689,7 +1699,7 @@ msgstr "Dieses Regal ist leer."
#: bookwyrm/templates/lists/delete_list_modal.html:15
#: bookwyrm/templates/settings/announcement.html:20
#: bookwyrm/templates/settings/email_blocklist.html:50
#: bookwyrm/templates/settings/email_blocklist.html:49
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
#: bookwyrm/templates/snippets/follow_request_buttons.html:12
msgid "Delete"
@ -2229,6 +2239,8 @@ msgstr "Suche"
#: bookwyrm/templates/search/layout.html:23
#: bookwyrm/templates/search/layout.html:46
#: bookwyrm/templates/settings/email_blocklist.html:27
#: bookwyrm/templates/settings/federation.html:44
#: bookwyrm/templates/settings/layout.html:34
#: bookwyrm/templates/user_admin/user_admin.html:3
#: bookwyrm/templates/user_admin/user_admin.html:10
@ -2328,32 +2340,33 @@ msgstr "Geburtsdatum:"
msgid "Announcements"
msgstr "Ankündigungen"
#: bookwyrm/templates/settings/announcements.html:21
#: bookwyrm/templates/settings/announcements.html:22
#: bookwyrm/templates/settings/federation.html:36
#, fuzzy
#| msgid "Added:"
msgid "Date added"
msgstr "Hinzugefügt:"
#: bookwyrm/templates/settings/announcements.html:25
#: bookwyrm/templates/settings/announcements.html:26
#, fuzzy
#| msgid "reviewed"
msgid "Preview"
msgstr "bewertete"
#: bookwyrm/templates/settings/announcements.html:29
#: bookwyrm/templates/settings/announcements.html:30
#, fuzzy
#| msgid "Started"
msgid "Start date"
msgstr "Gestartet"
#: bookwyrm/templates/settings/announcements.html:33
#: bookwyrm/templates/settings/announcements.html:34
#, fuzzy
#| msgid "Edit read dates"
msgid "End date"
msgstr "Lesedaten bearbeiten"
#: bookwyrm/templates/settings/announcements.html:37
#: bookwyrm/templates/settings/federation.html:30
#: bookwyrm/templates/settings/announcements.html:38
#: bookwyrm/templates/settings/federation.html:46
#: bookwyrm/templates/settings/manage_invite_requests.html:44
#: bookwyrm/templates/settings/status_filter.html:5
#: bookwyrm/templates/user_admin/user_admin.html:34
@ -2361,18 +2374,24 @@ msgstr "Lesedaten bearbeiten"
msgid "Status"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
#, fuzzy
#| msgid "Activity"
msgid "active"
msgstr "Aktivität"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
#, fuzzy
#| msgid "Activity"
msgid "inactive"
msgstr "Aktivität"
#: bookwyrm/templates/settings/announcements.html:54
#, fuzzy
#| msgid "Announcements"
msgid "No announcements found."
msgstr "Ankündigungen"
#: bookwyrm/templates/settings/dashboard.html:6
#: bookwyrm/templates/settings/dashboard.html:8
#: bookwyrm/templates/settings/layout.html:26
@ -2541,13 +2560,13 @@ msgstr "Wenn sich jemand mit einer E-Mail-Adresse von dieser Domain zu registrie
msgid "Domain"
msgstr ""
#: bookwyrm/templates/settings/email_blocklist.html:30
#: bookwyrm/templates/settings/email_blocklist.html:29
#, fuzzy
#| msgid "Notifications"
msgid "Options"
msgstr "Benachrichtigungen"
#: bookwyrm/templates/settings/email_blocklist.html:39
#: bookwyrm/templates/settings/email_blocklist.html:38
#, fuzzy, python-format
#| msgid "%(count)d uses"
msgid "%(display_count)s user"
@ -2642,20 +2661,14 @@ msgstr ""
msgid "Federated Instances"
msgstr "Föderierende Server"
#: bookwyrm/templates/settings/federation.html:19
#: bookwyrm/templates/settings/federation.html:32
#: bookwyrm/templates/user_admin/server_filter.html:5
#, fuzzy
#| msgid "Instance Name:"
msgid "Instance name"
msgstr "Instanzname"
#: bookwyrm/templates/settings/federation.html:23
#, fuzzy
#| msgid "Federated"
msgid "Date federated"
msgstr "Föderiert"
#: bookwyrm/templates/settings/federation.html:27
#: bookwyrm/templates/settings/federation.html:40
msgid "Software"
msgstr ""
@ -3880,6 +3893,11 @@ msgstr "Ein Passwortwiederherstellungslinl wurde zu %s gesendet"
msgid "Status updates from {obj.display_name}"
msgstr "Status updates von {obj.display_name}"
#, fuzzy
#~| msgid "Federated"
#~ msgid "Date federated"
#~ msgstr "Föderiert"
#~ msgid "Search Results for \"%(query)s\""
#~ msgstr "Suchergebnisse für \"%(query)s\""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-11 20:58+0000\n"
"POT-Creation-Date: 2021-09-12 17:16+0000\n"
"PO-Revision-Date: 2021-02-28 17:19-0800\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: English <LL@li.org>\n"
@ -74,6 +74,14 @@ msgstr ""
msgid "Descending"
msgstr ""
#: bookwyrm/importers/importer.py:75
msgid "Error loading book"
msgstr ""
#: bookwyrm/importers/importer.py:88
msgid "Could not find a match for book"
msgstr ""
#: bookwyrm/models/base_model.py:13
msgid "Pending"
msgstr ""
@ -96,12 +104,14 @@ msgstr ""
#: bookwyrm/models/federated_server.py:11
#: bookwyrm/templates/settings/edit_server.html:40
#: bookwyrm/templates/settings/federation.html:19
msgid "Federated"
msgstr ""
#: bookwyrm/models/federated_server.py:12
#: bookwyrm/templates/settings/edit_server.html:41
#: bookwyrm/templates/settings/federated_server.html:10
#: bookwyrm/templates/settings/federation.html:23
msgid "Blocked"
msgstr ""
@ -1544,7 +1554,7 @@ msgstr ""
#: bookwyrm/templates/lists/delete_list_modal.html:15
#: bookwyrm/templates/settings/announcement.html:20
#: bookwyrm/templates/settings/email_blocklist.html:50
#: bookwyrm/templates/settings/email_blocklist.html:49
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
#: bookwyrm/templates/snippets/follow_request_buttons.html:12
msgid "Delete"
@ -2029,6 +2039,8 @@ msgstr ""
#: bookwyrm/templates/search/layout.html:23
#: bookwyrm/templates/search/layout.html:46
#: bookwyrm/templates/settings/email_blocklist.html:27
#: bookwyrm/templates/settings/federation.html:44
#: bookwyrm/templates/settings/layout.html:34
#: bookwyrm/templates/user_admin/user_admin.html:3
#: bookwyrm/templates/user_admin/user_admin.html:10
@ -2107,24 +2119,25 @@ msgstr ""
msgid "Announcements"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:21
#: bookwyrm/templates/settings/announcements.html:22
#: bookwyrm/templates/settings/federation.html:36
msgid "Date added"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:25
#: bookwyrm/templates/settings/announcements.html:26
msgid "Preview"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:29
#: bookwyrm/templates/settings/announcements.html:30
msgid "Start date"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:33
#: bookwyrm/templates/settings/announcements.html:34
msgid "End date"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:37
#: bookwyrm/templates/settings/federation.html:30
#: bookwyrm/templates/settings/announcements.html:38
#: bookwyrm/templates/settings/federation.html:46
#: bookwyrm/templates/settings/manage_invite_requests.html:44
#: bookwyrm/templates/settings/status_filter.html:5
#: bookwyrm/templates/user_admin/user_admin.html:34
@ -2132,14 +2145,18 @@ msgstr ""
msgid "Status"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "active"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "inactive"
msgstr ""
#: bookwyrm/templates/settings/announcements.html:54
msgid "No announcements found."
msgstr ""
#: bookwyrm/templates/settings/dashboard.html:6
#: bookwyrm/templates/settings/dashboard.html:8
#: bookwyrm/templates/settings/layout.html:26
@ -2278,11 +2295,11 @@ msgstr ""
msgid "Domain"
msgstr ""
#: bookwyrm/templates/settings/email_blocklist.html:30
#: bookwyrm/templates/settings/email_blocklist.html:29
msgid "Options"
msgstr ""
#: bookwyrm/templates/settings/email_blocklist.html:39
#: bookwyrm/templates/settings/email_blocklist.html:38
#, python-format
msgid "%(display_count)s user"
msgid_plural "%(display_count)s users"
@ -2362,16 +2379,12 @@ msgstr ""
msgid "Federated Instances"
msgstr ""
#: bookwyrm/templates/settings/federation.html:19
#: bookwyrm/templates/settings/federation.html:32
#: bookwyrm/templates/user_admin/server_filter.html:5
msgid "Instance name"
msgstr ""
#: bookwyrm/templates/settings/federation.html:23
msgid "Date federated"
msgstr ""
#: bookwyrm/templates/settings/federation.html:27
#: bookwyrm/templates/settings/federation.html:40
msgid "Software"
msgstr ""

Binary file not shown.

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-11 20:58+0000\n"
"POT-Creation-Date: 2021-09-12 17:16+0000\n"
"PO-Revision-Date: 2021-03-19 11:49+0800\n"
"Last-Translator: Reese Porter <reesedporter@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,6 +74,14 @@ msgstr "Ascendente"
msgid "Descending"
msgstr "Descendente"
#: bookwyrm/importers/importer.py:75
msgid "Error loading book"
msgstr ""
#: bookwyrm/importers/importer.py:88
msgid "Could not find a match for book"
msgstr ""
#: bookwyrm/models/base_model.py:13
#, fuzzy
#| msgid "Ascending"
@ -104,12 +112,14 @@ msgstr "Desbloquear"
#: bookwyrm/models/federated_server.py:11
#: bookwyrm/templates/settings/edit_server.html:40
#: bookwyrm/templates/settings/federation.html:19
msgid "Federated"
msgstr "Federalizado"
#: bookwyrm/models/federated_server.py:12
#: bookwyrm/templates/settings/edit_server.html:41
#: bookwyrm/templates/settings/federated_server.html:10
#: bookwyrm/templates/settings/federation.html:23
msgid "Blocked"
msgstr "Bloqueado"
@ -1562,7 +1572,7 @@ msgstr "Este campo no puede ser nulo."
#: bookwyrm/templates/lists/delete_list_modal.html:15
#: bookwyrm/templates/settings/announcement.html:20
#: bookwyrm/templates/settings/email_blocklist.html:50
#: bookwyrm/templates/settings/email_blocklist.html:49
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
#: bookwyrm/templates/snippets/follow_request_buttons.html:12
msgid "Delete"
@ -2053,6 +2063,8 @@ msgstr "Tipo de búsqueda"
#: bookwyrm/templates/search/layout.html:23
#: bookwyrm/templates/search/layout.html:46
#: bookwyrm/templates/settings/email_blocklist.html:27
#: bookwyrm/templates/settings/federation.html:44
#: bookwyrm/templates/settings/layout.html:34
#: bookwyrm/templates/user_admin/user_admin.html:3
#: bookwyrm/templates/user_admin/user_admin.html:10
@ -2137,24 +2149,25 @@ msgstr "Fecha final:"
msgid "Announcements"
msgstr "Anuncios"
#: bookwyrm/templates/settings/announcements.html:21
#: bookwyrm/templates/settings/announcements.html:22
#: bookwyrm/templates/settings/federation.html:36
msgid "Date added"
msgstr "Fecha agregada"
#: bookwyrm/templates/settings/announcements.html:25
#: bookwyrm/templates/settings/announcements.html:26
msgid "Preview"
msgstr "Vista preliminar"
#: bookwyrm/templates/settings/announcements.html:29
#: bookwyrm/templates/settings/announcements.html:30
msgid "Start date"
msgstr "Fecha de inicio"
#: bookwyrm/templates/settings/announcements.html:33
#: bookwyrm/templates/settings/announcements.html:34
msgid "End date"
msgstr "Fecha final"
#: bookwyrm/templates/settings/announcements.html:37
#: bookwyrm/templates/settings/federation.html:30
#: bookwyrm/templates/settings/announcements.html:38
#: bookwyrm/templates/settings/federation.html:46
#: bookwyrm/templates/settings/manage_invite_requests.html:44
#: bookwyrm/templates/settings/status_filter.html:5
#: bookwyrm/templates/user_admin/user_admin.html:34
@ -2162,14 +2175,20 @@ msgstr "Fecha final"
msgid "Status"
msgstr "Status"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "active"
msgstr "activo"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "inactive"
msgstr "inactivo"
#: bookwyrm/templates/settings/announcements.html:54
#, fuzzy
#| msgid "Announcements"
msgid "No announcements found."
msgstr "Anuncios"
#: bookwyrm/templates/settings/dashboard.html:6
#: bookwyrm/templates/settings/dashboard.html:8
#: bookwyrm/templates/settings/layout.html:26
@ -2328,13 +2347,13 @@ msgstr ""
msgid "Domain"
msgstr ""
#: bookwyrm/templates/settings/email_blocklist.html:30
#: bookwyrm/templates/settings/email_blocklist.html:29
#, fuzzy
#| msgid "Actions"
msgid "Options"
msgstr "Acciones"
#: bookwyrm/templates/settings/email_blocklist.html:39
#: bookwyrm/templates/settings/email_blocklist.html:38
#, fuzzy, python-format
#| msgid "%(count)d uses"
msgid "%(display_count)s user"
@ -2415,16 +2434,12 @@ msgstr "Todos los usuarios en esta instancia serán re-activados."
msgid "Federated Instances"
msgstr "Instancias federalizadas"
#: bookwyrm/templates/settings/federation.html:19
#: bookwyrm/templates/settings/federation.html:32
#: bookwyrm/templates/user_admin/server_filter.html:5
msgid "Instance name"
msgstr "Nombre de instancia"
#: bookwyrm/templates/settings/federation.html:23
msgid "Date federated"
msgstr "Fecha de federalización"
#: bookwyrm/templates/settings/federation.html:27
#: bookwyrm/templates/settings/federation.html:40
msgid "Software"
msgstr "Software"
@ -3553,6 +3568,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
msgid "Status updates from {obj.display_name}"
msgstr "Actualizaciones de status de {obj.display_name}"
#~ msgid "Date federated"
#~ msgstr "Fecha de federalización"
#~ msgid "Search Results for \"%(query)s\""
#~ msgstr "Resultados de búsqueda por \"%(query)s\""

Binary file not shown.

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-11 20:58+0000\n"
"POT-Creation-Date: 2021-09-12 17:16+0000\n"
"PO-Revision-Date: 2021-04-05 12:44+0100\n"
"Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n"
@ -74,6 +74,14 @@ msgstr "Ordre croissant"
msgid "Descending"
msgstr "Ordre décroissant"
#: bookwyrm/importers/importer.py:75
msgid "Error loading book"
msgstr ""
#: bookwyrm/importers/importer.py:88
msgid "Could not find a match for book"
msgstr ""
#: bookwyrm/models/base_model.py:13
#, fuzzy
#| msgid "Ascending"
@ -104,12 +112,14 @@ msgstr "Débloquer"
#: bookwyrm/models/federated_server.py:11
#: bookwyrm/templates/settings/edit_server.html:40
#: bookwyrm/templates/settings/federation.html:19
msgid "Federated"
msgstr "Fédéré"
#: bookwyrm/models/federated_server.py:12
#: bookwyrm/templates/settings/edit_server.html:41
#: bookwyrm/templates/settings/federated_server.html:10
#: bookwyrm/templates/settings/federation.html:23
msgid "Blocked"
msgstr "Bloqué"
@ -1581,7 +1591,7 @@ msgstr "Cette étagère est vide"
#: bookwyrm/templates/lists/delete_list_modal.html:15
#: bookwyrm/templates/settings/announcement.html:20
#: bookwyrm/templates/settings/email_blocklist.html:50
#: bookwyrm/templates/settings/email_blocklist.html:49
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
#: bookwyrm/templates/snippets/follow_request_buttons.html:12
msgid "Delete"
@ -2085,6 +2095,8 @@ msgstr "Type de recherche"
#: bookwyrm/templates/search/layout.html:23
#: bookwyrm/templates/search/layout.html:46
#: bookwyrm/templates/settings/email_blocklist.html:27
#: bookwyrm/templates/settings/federation.html:44
#: bookwyrm/templates/settings/layout.html:34
#: bookwyrm/templates/user_admin/user_admin.html:3
#: bookwyrm/templates/user_admin/user_admin.html:10
@ -2169,24 +2181,25 @@ msgstr "Date de fin:"
msgid "Announcements"
msgstr "Annonces"
#: bookwyrm/templates/settings/announcements.html:21
#: bookwyrm/templates/settings/announcements.html:22
#: bookwyrm/templates/settings/federation.html:36
msgid "Date added"
msgstr "Date dajout"
#: bookwyrm/templates/settings/announcements.html:25
#: bookwyrm/templates/settings/announcements.html:26
msgid "Preview"
msgstr "Aperçu"
#: bookwyrm/templates/settings/announcements.html:29
#: bookwyrm/templates/settings/announcements.html:30
msgid "Start date"
msgstr "Date de début"
#: bookwyrm/templates/settings/announcements.html:33
#: bookwyrm/templates/settings/announcements.html:34
msgid "End date"
msgstr "Date de fin"
#: bookwyrm/templates/settings/announcements.html:37
#: bookwyrm/templates/settings/federation.html:30
#: bookwyrm/templates/settings/announcements.html:38
#: bookwyrm/templates/settings/federation.html:46
#: bookwyrm/templates/settings/manage_invite_requests.html:44
#: bookwyrm/templates/settings/status_filter.html:5
#: bookwyrm/templates/user_admin/user_admin.html:34
@ -2194,14 +2207,20 @@ msgstr "Date de fin"
msgid "Status"
msgstr "Statut"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "active"
msgstr "active"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "inactive"
msgstr "inactive"
#: bookwyrm/templates/settings/announcements.html:54
#, fuzzy
#| msgid "Announcements"
msgid "No announcements found."
msgstr "Annonces"
#: bookwyrm/templates/settings/dashboard.html:6
#: bookwyrm/templates/settings/dashboard.html:8
#: bookwyrm/templates/settings/layout.html:26
@ -2358,13 +2377,13 @@ msgstr ""
msgid "Domain"
msgstr ""
#: bookwyrm/templates/settings/email_blocklist.html:30
#: bookwyrm/templates/settings/email_blocklist.html:29
#, fuzzy
#| msgid "Actions"
msgid "Options"
msgstr "Actions"
#: bookwyrm/templates/settings/email_blocklist.html:39
#: bookwyrm/templates/settings/email_blocklist.html:38
#, fuzzy, python-format
#| msgid "%(count)d uses"
msgid "%(display_count)s user"
@ -2445,16 +2464,12 @@ msgstr "Tous les comptes de cette instance seront réactivés."
msgid "Federated Instances"
msgstr "Instances fédérées"
#: bookwyrm/templates/settings/federation.html:19
#: bookwyrm/templates/settings/federation.html:32
#: bookwyrm/templates/user_admin/server_filter.html:5
msgid "Instance name"
msgstr "Nom de linstance"
#: bookwyrm/templates/settings/federation.html:23
msgid "Date federated"
msgstr "Date de fédération"
#: bookwyrm/templates/settings/federation.html:27
#: bookwyrm/templates/settings/federation.html:40
msgid "Software"
msgstr "Logiciel"
@ -3600,6 +3615,9 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
msgid "Status updates from {obj.display_name}"
msgstr ""
#~ msgid "Date federated"
#~ msgstr "Date de fédération"
#~ msgid "Search Results for \"%(query)s\""
#~ msgstr "Résultats de recherche pour « %(query)s»"

Binary file not shown.

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-11 20:58+0000\n"
"POT-Creation-Date: 2021-09-12 17:16+0000\n"
"PO-Revision-Date: 2021-03-20 00:56+0000\n"
"Last-Translator: Kana <gudzpoz@live.com>\n"
"Language-Team: Mouse Reeve <LL@li.org>\n"
@ -74,6 +74,14 @@ msgstr "升序"
msgid "Descending"
msgstr "降序"
#: bookwyrm/importers/importer.py:75
msgid "Error loading book"
msgstr ""
#: bookwyrm/importers/importer.py:88
msgid "Could not find a match for book"
msgstr ""
#: bookwyrm/models/base_model.py:13
#, fuzzy
#| msgid "Ascending"
@ -104,12 +112,14 @@ msgstr "取消屏蔽"
#: bookwyrm/models/federated_server.py:11
#: bookwyrm/templates/settings/edit_server.html:40
#: bookwyrm/templates/settings/federation.html:19
msgid "Federated"
msgstr "跨站"
#: bookwyrm/models/federated_server.py:12
#: bookwyrm/templates/settings/edit_server.html:41
#: bookwyrm/templates/settings/federated_server.html:10
#: bookwyrm/templates/settings/federation.html:23
msgid "Blocked"
msgstr "已屏蔽"
@ -1561,7 +1571,7 @@ msgstr ""
#: bookwyrm/templates/lists/delete_list_modal.html:15
#: bookwyrm/templates/settings/announcement.html:20
#: bookwyrm/templates/settings/email_blocklist.html:50
#: bookwyrm/templates/settings/email_blocklist.html:49
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
#: bookwyrm/templates/snippets/follow_request_buttons.html:12
msgid "Delete"
@ -2059,6 +2069,8 @@ msgstr "搜索类型"
#: bookwyrm/templates/search/layout.html:23
#: bookwyrm/templates/search/layout.html:46
#: bookwyrm/templates/settings/email_blocklist.html:27
#: bookwyrm/templates/settings/federation.html:44
#: bookwyrm/templates/settings/layout.html:34
#: bookwyrm/templates/user_admin/user_admin.html:3
#: bookwyrm/templates/user_admin/user_admin.html:10
@ -2143,24 +2155,25 @@ msgstr "结束日期:"
msgid "Announcements"
msgstr "公告"
#: bookwyrm/templates/settings/announcements.html:21
#: bookwyrm/templates/settings/announcements.html:22
#: bookwyrm/templates/settings/federation.html:36
msgid "Date added"
msgstr "添加日期:"
#: bookwyrm/templates/settings/announcements.html:25
#: bookwyrm/templates/settings/announcements.html:26
msgid "Preview"
msgstr "预览"
#: bookwyrm/templates/settings/announcements.html:29
#: bookwyrm/templates/settings/announcements.html:30
msgid "Start date"
msgstr "开始日期"
#: bookwyrm/templates/settings/announcements.html:33
#: bookwyrm/templates/settings/announcements.html:34
msgid "End date"
msgstr "结束日期"
#: bookwyrm/templates/settings/announcements.html:37
#: bookwyrm/templates/settings/federation.html:30
#: bookwyrm/templates/settings/announcements.html:38
#: bookwyrm/templates/settings/federation.html:46
#: bookwyrm/templates/settings/manage_invite_requests.html:44
#: bookwyrm/templates/settings/status_filter.html:5
#: bookwyrm/templates/user_admin/user_admin.html:34
@ -2168,14 +2181,20 @@ msgstr "结束日期"
msgid "Status"
msgstr "状态"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "active"
msgstr "活跃"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "inactive"
msgstr "停用"
#: bookwyrm/templates/settings/announcements.html:54
#, fuzzy
#| msgid "Announcements"
msgid "No announcements found."
msgstr "公告"
#: bookwyrm/templates/settings/dashboard.html:6
#: bookwyrm/templates/settings/dashboard.html:8
#: bookwyrm/templates/settings/layout.html:26
@ -2330,13 +2349,13 @@ msgstr ""
msgid "Domain"
msgstr ""
#: bookwyrm/templates/settings/email_blocklist.html:30
#: bookwyrm/templates/settings/email_blocklist.html:29
#, fuzzy
#| msgid "Actions"
msgid "Options"
msgstr "动作"
#: bookwyrm/templates/settings/email_blocklist.html:39
#: bookwyrm/templates/settings/email_blocklist.html:38
#, fuzzy, python-format
#| msgid "%(count)d uses"
msgid "%(display_count)s user"
@ -2416,16 +2435,12 @@ msgstr "来自此实例的所有用户将会被重新启用。"
msgid "Federated Instances"
msgstr "互联实例"
#: bookwyrm/templates/settings/federation.html:19
#: bookwyrm/templates/settings/federation.html:32
#: bookwyrm/templates/user_admin/server_filter.html:5
msgid "Instance name"
msgstr "实例名称"
#: bookwyrm/templates/settings/federation.html:23
msgid "Date federated"
msgstr "跨站日期"
#: bookwyrm/templates/settings/federation.html:27
#: bookwyrm/templates/settings/federation.html:40
msgid "Software"
msgstr "软件"
@ -3541,6 +3556,9 @@ msgstr "密码重置连接已发送给 %s"
msgid "Status updates from {obj.display_name}"
msgstr ""
#~ msgid "Date federated"
#~ msgstr "跨站日期"
#~ msgid "Search Results for \"%(query)s\""
#~ msgstr "\"%(query)s\" 的搜索结果"

Binary file not shown.

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-11 20:58+0000\n"
"POT-Creation-Date: 2021-09-12 17:16+0000\n"
"PO-Revision-Date: 2021-06-30 10:36+0000\n"
"Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,6 +74,14 @@ msgstr "升序"
msgid "Descending"
msgstr "降序"
#: bookwyrm/importers/importer.py:75
msgid "Error loading book"
msgstr ""
#: bookwyrm/importers/importer.py:88
msgid "Could not find a match for book"
msgstr ""
#: bookwyrm/models/base_model.py:13
#, fuzzy
#| msgid "Ascending"
@ -104,12 +112,14 @@ msgstr "取消封鎖"
#: bookwyrm/models/federated_server.py:11
#: bookwyrm/templates/settings/edit_server.html:40
#: bookwyrm/templates/settings/federation.html:19
msgid "Federated"
msgstr "跨站"
#: bookwyrm/models/federated_server.py:12
#: bookwyrm/templates/settings/edit_server.html:41
#: bookwyrm/templates/settings/federated_server.html:10
#: bookwyrm/templates/settings/federation.html:23
msgid "Blocked"
msgstr "已封鎖"
@ -1590,7 +1600,7 @@ msgstr ""
#: bookwyrm/templates/lists/delete_list_modal.html:15
#: bookwyrm/templates/settings/announcement.html:20
#: bookwyrm/templates/settings/email_blocklist.html:50
#: bookwyrm/templates/settings/email_blocklist.html:49
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
#: bookwyrm/templates/snippets/follow_request_buttons.html:12
msgid "Delete"
@ -2094,6 +2104,8 @@ msgstr "搜尋類別"
#: bookwyrm/templates/search/layout.html:23
#: bookwyrm/templates/search/layout.html:46
#: bookwyrm/templates/settings/email_blocklist.html:27
#: bookwyrm/templates/settings/federation.html:44
#: bookwyrm/templates/settings/layout.html:34
#: bookwyrm/templates/user_admin/user_admin.html:3
#: bookwyrm/templates/user_admin/user_admin.html:10
@ -2178,24 +2190,25 @@ msgstr "結束日期:"
msgid "Announcements"
msgstr "公告"
#: bookwyrm/templates/settings/announcements.html:21
#: bookwyrm/templates/settings/announcements.html:22
#: bookwyrm/templates/settings/federation.html:36
msgid "Date added"
msgstr "新增日期:"
#: bookwyrm/templates/settings/announcements.html:25
#: bookwyrm/templates/settings/announcements.html:26
msgid "Preview"
msgstr "預覽"
#: bookwyrm/templates/settings/announcements.html:29
#: bookwyrm/templates/settings/announcements.html:30
msgid "Start date"
msgstr "開始日期"
#: bookwyrm/templates/settings/announcements.html:33
#: bookwyrm/templates/settings/announcements.html:34
msgid "End date"
msgstr "結束日期"
#: bookwyrm/templates/settings/announcements.html:37
#: bookwyrm/templates/settings/federation.html:30
#: bookwyrm/templates/settings/announcements.html:38
#: bookwyrm/templates/settings/federation.html:46
#: bookwyrm/templates/settings/manage_invite_requests.html:44
#: bookwyrm/templates/settings/status_filter.html:5
#: bookwyrm/templates/user_admin/user_admin.html:34
@ -2203,14 +2216,20 @@ msgstr "結束日期"
msgid "Status"
msgstr "狀態"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "active"
msgstr "啟用"
#: bookwyrm/templates/settings/announcements.html:47
#: bookwyrm/templates/settings/announcements.html:48
msgid "inactive"
msgstr "停用"
#: bookwyrm/templates/settings/announcements.html:54
#, fuzzy
#| msgid "Announcements"
msgid "No announcements found."
msgstr "公告"
#: bookwyrm/templates/settings/dashboard.html:6
#: bookwyrm/templates/settings/dashboard.html:8
#: bookwyrm/templates/settings/layout.html:26
@ -2365,13 +2384,13 @@ msgstr ""
msgid "Domain"
msgstr ""
#: bookwyrm/templates/settings/email_blocklist.html:30
#: bookwyrm/templates/settings/email_blocklist.html:29
#, fuzzy
#| msgid "Actions"
msgid "Options"
msgstr "動作"
#: bookwyrm/templates/settings/email_blocklist.html:39
#: bookwyrm/templates/settings/email_blocklist.html:38
#, fuzzy, python-format
#| msgid "%(count)d uses"
msgid "%(display_count)s user"
@ -2451,16 +2470,12 @@ msgstr "來自此實例的所有使用者將會被重新啟用。"
msgid "Federated Instances"
msgstr "聯合實例"
#: bookwyrm/templates/settings/federation.html:19
#: bookwyrm/templates/settings/federation.html:32
#: bookwyrm/templates/user_admin/server_filter.html:5
msgid "Instance name"
msgstr "實例名稱"
#: bookwyrm/templates/settings/federation.html:23
msgid "Date federated"
msgstr "跨站日期"
#: bookwyrm/templates/settings/federation.html:27
#: bookwyrm/templates/settings/federation.html:40
msgid "Software"
msgstr "軟體"
@ -3597,6 +3612,9 @@ msgstr "密碼重置連結已傳送給 %s"
msgid "Status updates from {obj.display_name}"
msgstr ""
#~ msgid "Date federated"
#~ msgstr "跨站日期"
#~ msgid "Search Results for \"%(query)s\""
#~ msgstr "\"%(query)s\" 的搜尋結果"