Merge branch 'main' into production

bookwyrm/forms.py

@@ -233,7 +233,7 @@ class InviteRequestForm(CustomForm):
 class CreateInviteForm(CustomForm):
     class Meta:
         model = models.SiteInvite
-        exclude = ["code", "user", "times_used"]
+        exclude = ["code", "user", "times_used", "invitees"]
         widgets = {
             "expiry": ExpiryWidget(
                 choices=[

bookwyrm/templates/lists/lists.html

@@ -11,7 +11,7 @@
         <h1 class="title">
             {% trans "Lists" %}
             {% if request.user.is_authenticated %}
-            <a class="help has-text-weight-normal" href="{% url 'user-lists' request.user|username %}">Your lists</a>
+            <a class="help has-text-weight-normal" href="{% url 'user-lists' request.user|username %}">{% trans "Your Lists" %}</a>
             {% endif %}
         </h1>
     </div>

bookwyrm/templates/snippets/table-sort-header.html

@@ -3,7 +3,7 @@
     {{ text }}
     {% if sort == field %}
     <span class="icon icon-arrow-up">
-        <span class="is-sr-only">{% trans "Sorted asccending" %}</span>
+        <span class="is-sr-only">{% trans "Sorted ascending" %}</span>
     </span>
     {% elif sort == "-"|add:field %}
     <span class="icon icon-arrow-down">

instances.md

@@ -2,3 +2,4 @@
 | name | url | admin contact | open registration |
 | :--- | :-- | :------------ | :---------------- |
 | bookwyrm.social | http://bookwyrm.social/ | mousereeve@riseup.net / @tripofmice@friend.camp | ❌ |
+| wyrms.de | https://wyrms.de/ | wyrms@tofuwabo.hu / @tofuwabohu@subversive.zone | ❌ | 

locale/de_DE/LC_MESSAGES/django.po

@@ -2565,7 +2565,7 @@ msgstr "Zu dieser Edition wechseln"
 #: bookwyrm/templates/snippets/table-sort-header.html:6
 #, fuzzy
 #| msgid "Started reading"
-msgid "Sorted asccending"
+msgid "Sorted ascending"
 msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10

locale/en_US/LC_MESSAGES/django.po

@@ -2408,7 +2408,7 @@ msgid "Switch to this edition"
 msgstr ""
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
-msgid "Sorted asccending"
+msgid "Sorted ascending"
 msgstr ""
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10

locale/es/LC_MESSAGES/django.po

@@ -2557,7 +2557,7 @@ msgstr "Cambiar a esta edición"
 #: bookwyrm/templates/snippets/table-sort-header.html:6
 #, fuzzy
 #| msgid "Started reading"
-msgid "Sorted asccending"
+msgid "Sorted ascending"
 msgstr "Lectura se empezó"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10

locale/zh_CN/LC_MESSAGES/django.po

@@ -2413,7 +2413,7 @@ msgid "Switch to this edition"
 msgstr "切换到此版本"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
-msgid "Sorted asccending"
+msgid "Sorted ascending"
 msgstr "升序排序"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10